Disable Carbon framework dependency on 64bit ABI of Mac OS X 10.4.x

18 years ago · 86a3ee7613
parent 14ffe0911f
commit 86a3ee7613
4 changed files with 25 additions and 1 deletions
--- a/7
+++ b/7
@ -1,3 +1,10 @@
+2007-03-26  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>
+
+	* builds/unix/ftconfig.in: disable Carbon framework dependency on
+	64bit ABI on Mac OS X 10.4.x (ppc & i386), found by Sean McBride.
+	* builds/vms/ftconfig.h: Ditto.
+	* include/freetype/config/ftconfig.h: Ditto.
+
 2007-03-22  suzuki toshiya  <mpsuzuki@hiroshima-u.ac.jp>

 	* builds/unix/ftsystem.c (FT_Stream_Open): Temporary fix to prevent
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@ -100,7 +100,10 @@ FT_BEGIN_HEADER
  /*                                                                       */
 #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
    ( defined( __MWERKS__ ) && defined( macintosh )        )
-#if defined( __ppc64__ ) /* no Carbon for ppc64 */
+  /* no Carbon frameworks for 64bit 10.4.x */
+#include "AvailabilityMacros.h"
+#if defined( __LP64__ ) && \
+    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
 #define DARWIN_NO_CARBON 1
 #else
 #define FT_MACINTOSH 1
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@ -101,7 +101,14 @@ FT_BEGIN_HEADER
  /*                                                                       */
 #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
    ( defined( __MWERKS__ ) && defined( macintosh )        )
+  /* no Carbon frameworks for 64bit 10.4.x */
+#include "AvailabilityMacros.h"
+#if defined( __LP64__ ) && \
+    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
+#define DARWIN_NO_CARBON 1
+#else
 #define FT_MACINTOSH 1
+#endif
 #endif


--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@ -126,7 +126,14 @@ FT_BEGIN_HEADER
  /*                                                                       */
 #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
    ( defined( __MWERKS__ ) && defined( macintosh )        )
+  /* no Carbon frameworks for 64bit 10.4.x */
+#include "AvailabilityMacros.h"
+#if defined( __LP64__ ) && \
+    ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
+#define DARWIN_NO_CARBON 1
+#else
 #define FT_MACINTOSH 1
+#endif
 #endif