diff options
| author | Werner Lemberg <wl@gnu.org> | 2011-03-19 15:27:04 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2011-03-19 15:27:04 +0100 |
| commit | 8bd77f9030a718daf6526ce631e9e79fd62a95bd (patch) | |
| tree | ccfdae9f249b98784af70eeb189bbb573290a176 | |
| parent | c7f26a19827e132b1be59a4cd3123e3d871d4dae (diff) | |
More C++ compilation fixes.
* src/autofit/afhints.c (af_glyph_hints_dump_points,
af_glyph_hints_dump_segments, af_glyph_hints_dump_edges)
[__cplusplus]: Protect with `extern "C"'.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/autofit/afhints.c | 26 |
2 files changed, 34 insertions, 0 deletions
@@ -1,3 +1,11 @@ +2011-03-19 Werner Lemberg <wl@gnu.org> + + More C++ compilation fixes. + + * src/autofit/afhints.c (af_glyph_hints_dump_points, + af_glyph_hints_dump_segments, af_glyph_hints_dump_edges) + [__cplusplus]: Protect with `extern "C"'. + 2011-03-18 Werner Lemberg <wl@gnu.org> C++ compilation fixes. diff --git a/src/autofit/afhints.c b/src/autofit/afhints.c index 75c2c331..5d24b15e 100644 --- a/src/autofit/afhints.c +++ b/src/autofit/afhints.c @@ -164,6 +164,9 @@ #define AF_INDEX_NUM( ptr, base ) ( (ptr) ? ( (ptr) - (base) ) : -1 ) +#ifdef __cplusplus + extern "C" { +#endif void af_glyph_hints_dump_points( AF_GlyphHints hints ) { @@ -196,6 +199,9 @@ } printf( "\n" ); } +#ifdef __cplusplus + } +#endif static const char* @@ -228,6 +234,9 @@ /* Dump the array of linked segments. */ +#ifdef __cplusplus + extern "C" { +#endif void af_glyph_hints_dump_segments( AF_GlyphHints hints ) { @@ -263,10 +272,16 @@ printf( "\n" ); } } +#ifdef __cplusplus + } +#endif /* Dump the array of linked edges. */ +#ifdef __cplusplus + extern "C" { +#endif void af_glyph_hints_dump_edges( AF_GlyphHints hints ) { @@ -307,12 +322,19 @@ printf( "\n" ); } } +#ifdef __cplusplus + } +#endif #else /* !AF_DEBUG */ /* these empty stubs are only used to link the `ftgrid' test program */ /* when debugging is disabled */ +#ifdef __cplusplus + extern "C" { +#endif + void af_glyph_hints_dump_points( AF_GlyphHints hints ) { @@ -333,6 +355,10 @@ FT_UNUSED( hints ); } +#ifdef __cplusplus + } +#endif + #endif /* !AF_DEBUG */ |