From c32d54c94950fc086e5c6943313a3d31b4e0873d Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Sun, 29 May 2011 01:33:34 +0900 Subject: [PATCH] [mac] Conditionalize the inclusion of "AvailabilityMacros.h". The native SDK on earliest Mac OS X (10.0-10.1) did not have "AvailabilityMacros.h". To prevent the inclusion of missing header file, ECANCELED (introduced in 10.2) in POSIX header file is checked to detect the system version. * include/freetype/config/ftconfig.h: Conditionalize the inclusion of "AvailabilityMacros.h". * builds/unix/ftconfig.in: Ditto. * builds/vms/ftconfig.h: Ditto. --- ChangeLog | 14 ++++++++++++++ builds/unix/ftconfig.in | 5 +++++ builds/vms/ftconfig.h | 5 +++++ include/freetype/config/ftconfig.h | 5 +++++ 4 files changed, 29 insertions(+) diff --git a/ChangeLog b/ChangeLog index 79a3e074e..ec9483bf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2011-05-28 suzuki toshiya + + [mac] Conditionalize the inclusion of "AvailabilityMacros.h". + + The native SDK on earliest Mac OS X (10.0-10.1) did not have + "AvailabilityMacros.h". To prevent the inclusion of missing + header file, ECANCELED (introduced in 10.2) in POSIX header + file is checked to detect the system version. + + * include/freetype/config/ftconfig.h: Conditionalize the + inclusion of "AvailabilityMacros.h". + * builds/unix/ftconfig.in: Ditto. + * builds/vms/ftconfig.h: Ditto. + 2011-05-27 Werner Lemberg [autofit] Improve tracing of hinting process. diff --git a/builds/unix/ftconfig.in b/builds/unix/ftconfig.in index d96492580..50351a0d0 100644 --- a/builds/unix/ftconfig.in +++ b/builds/unix/ftconfig.in @@ -149,7 +149,12 @@ FT_BEGIN_HEADER #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \ ( defined( __MWERKS__ ) && defined( macintosh ) ) /* no Carbon frameworks for 64bit 10.4.x */ + /* AvailabilityMacros.h was introduced since Mac OS X 10.2, */ + /* so guess the system version by maximum errno before inclusion */ +#include +#ifdef ECANCELED /* defined since 10.2 */ #include "AvailabilityMacros.h" +#endif #if defined( __LP64__ ) && \ ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 ) #define DARWIN_NO_CARBON 1 diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index 1659d039e..49b60a2eb 100644 --- a/builds/vms/ftconfig.h +++ b/builds/vms/ftconfig.h @@ -102,7 +102,12 @@ FT_BEGIN_HEADER #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \ ( defined( __MWERKS__ ) && defined( macintosh ) ) /* no Carbon frameworks for 64bit 10.4.x */ + /* AvailabilityMacros.h was introduced since Mac OS X 10.2, */ + /* so guess the system version by maximum errno before inclusion */ +#include +#ifdef ECANCELED /* defined since 10.2 */ #include "AvailabilityMacros.h" +#endif #if defined( __LP64__ ) && \ ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 ) #define DARWIN_NO_CARBON 1 diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index dd9d10c21..229719486 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -127,7 +127,12 @@ FT_BEGIN_HEADER #if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \ ( defined( __MWERKS__ ) && defined( macintosh ) ) /* no Carbon frameworks for 64bit 10.4.x */ + /* AvailabilityMacros.h was introduced since Mac OS X 10.2, */ + /* so guess the system version by maximum errno before inclusion */ +#include +#ifdef ECANCELED /* defined since 10.2 */ #include "AvailabilityMacros.h" +#endif #if defined( __LP64__ ) && \ ( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 ) #define DARWIN_NO_CARBON 1