[ft-devel] freetype 2.3.6 compile error on Mac 10.4

[Garrick Meeker]

I'm not sure about this, but it seems that the #if stuff for 10.5 in  
ftmac.c doesn't work, but it works some some extra parentheses.  I'd  
assume the preprocessor uses the usual precedence rules but I don't  
see that in the spec.  Anyway, this patch seems to improve things with  
the 10.4u SDK.  The ResourceIndex check also seems to fail because  
MAC_OS_X_VERSION_10_5 is defined in the 10.4u SDK, but I'm not sure  
how to work around that.

--- freetype-2.3.6-orig/src/base/ftmac.c	2008-05-21 23:11:03.000000000  
-0700
+++ freetype-2.3.6/src/base/ftmac.c     2008-06-23 14:59:38.000000000 -0700
@@ -134,7 +134,7 @@
                               FSRef*      ats_font_ref )
   {
 #if defined( MAC_OS_X_VERSION_10_5 ) && \
-    MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5
+    (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5)

     OSStatus  err;

@@ -234,8 +234,8 @@
                                 FSSpec*      pathSpec,
                                 FT_Long*     face_index )
   {
-#if ( __LP64__ ) || ( defined( MAC_OS_X_VERSION_10_5 ) && \
-      MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )
+#if ( __LP64__ ) || (( defined( MAC_OS_X_VERSION_10_5 ) && \
+      (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )))
     FT_UNUSED( fontName );
     FT_UNUSED( pathSpec );
     FT_UNUSED( face_index );
@@ -1107,8 +1107,8 @@
                            FT_Long        face_index,
                            FT_Face*       aface )
   {
-#if ( __LP64__ ) || ( defined( MAC_OS_X_VERSION_10_5 ) && \
-      MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )
+#if ( __LP64__ ) || ((( defined( MAC_OS_X_VERSION_10_5 ) && \
+      MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )))
     FT_UNUSED( library );
     FT_UNUSED( spec );
     FT_UNUSED( face_index );