Commit 8bd77f9030a718daf6526ce631e9e79fd62a95bd
2011-03-19T15:27:04
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"'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98
diff --git a/ChangeLog b/ChangeLog
index ce3ec76..8678ecb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 75c2c33..5d24b15 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 */