Ticket #15469: patch-sources.diff

../src/FTVectoriser.cpp

@@ -5 +5 @@
 #define CALLBACK
 #endif
 
-#ifdef __APPLE_CC__    
-    typedef GLvoid (*GLUTesselatorFunction)(...);
-#elif defined( __mips ) || defined( __linux__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __sun ) || defined (__CYGWIN__)
-    typedef GLvoid (*GLUTesselatorFunction)();
-#elif defined ( WIN32)
-    typedef GLvoid (CALLBACK *GLUTesselatorFunction)( );
+#if defined __APPLE_CC__ && __APPLE_CC__ < 5465
+    typedef GLvoid (*GLUTesselatorFunction) (...);
+#elif defined WIN32 && !defined __CYGWIN__
+    typedef GLvoid (CALLBACK *GLUTesselatorFunction) ();
 #else
-    #error "Error - need to define type GLUTesselatorFunction for this platform/compiler"
+    typedef GLvoid (*GLUTesselatorFunction) ();
 #endif
 
-
 void CALLBACK ftglError( GLenum errCode, FTMesh* mesh)
 {
     mesh->Error( errCode);

../demo/FTGLDemo.cpp

@@ -21 +21 @@
         #define FONT_FILE "/usr/share/fonts/truetype/arial.ttf"
 #endif
 #ifdef __APPLE_CC__
-        #define FONT_FILE "/Users/henry/Development/PROJECTS/FTGL/test/font_pack/arial.ttf"
+        #define FONT_FILE "/Library/Fonts/Arial.ttf"
 #endif
 #ifdef WIN32
         #define FONT_FILE "C:\\WINNT\\Fonts\\arial.ttf"