diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 10:33:22 +0100 |
| commit | 41bd254198b8b879a562a85f7dc868c3c0f7fbc1 (patch) | |
| tree | 3db49b4d73b8c4c734c1382ab5469a4f9f8baf93 /freetype/builds/vms | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.gz vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.tar.bz2 vcxsrv-41bd254198b8b879a562a85f7dc868c3c0f7fbc1.zip | |
Updated to freetype-2.4.9
Diffstat (limited to 'freetype/builds/vms')
| -rw-r--r-- | freetype/builds/vms/ftconfig.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/freetype/builds/vms/ftconfig.h b/freetype/builds/vms/ftconfig.h index 99c37db39..62fadac0f 100644 --- a/freetype/builds/vms/ftconfig.h +++ b/freetype/builds/vms/ftconfig.h @@ -95,8 +95,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 */ @@ -106,9 +105,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__ ) |