diff options
Diffstat (limited to 'freetype/builds/unix/ftconfig.in')
-rw-r--r-- | freetype/builds/unix/ftconfig.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/freetype/builds/unix/ftconfig.in b/freetype/builds/unix/ftconfig.in index fd4a5cd4f..9531afda1 100644 --- a/freetype/builds/unix/ftconfig.in +++ b/freetype/builds/unix/ftconfig.in @@ -142,8 +142,7 @@ FT_BEGIN_HEADER /* This is the only necessary change, so it is defined here instead */ /* providing a new configuration file. */ /* */ -#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \ - ( defined( __MWERKS__ ) && defined( macintosh ) ) +#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) ) /* no Carbon frameworks for 64bit 10.4.x */ /* AvailabilityMacros.h is available since Mac OS X 10.2, */ /* so guess the system version by maximum errno before inclusion */ @@ -153,9 +152,7 @@ FT_BEGIN_HEADER #endif #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 +/undef FT_MACINTOSH #endif #elif defined( __SC__ ) || defined( __MRC__ ) |