shithub: freetype+ttf2subf

Download patch

ref: 8bd77f9030a718daf6526ce631e9e79fd62a95bd
parent: c7f26a19827e132b1be59a4cd3123e3d871d4dae
author: Werner Lemberg <[email protected]>
date: Sat Mar 19 11:27:04 EDT 2011 

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"'.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-03-19  Werner Lemberg  <[email protected]>
+
+	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  <[email protected]>
 
 	C++ compilation fixes.
--- 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,6 +322,9 @@
       printf( "\n" );
     }
   }
+#ifdef __cplusplus
+  }
+#endif
 
 #else /* !AF_DEBUG */
 
@@ -313,6 +331,10 @@
   /* 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 )
   {
@@ -332,6 +354,10 @@
   {
     FT_UNUSED( hints );
   }
+
+#ifdef __cplusplus
+  }
+#endif
 
 #endif /* !AF_DEBUG */