[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 <errno.h> 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.
This commit is contained in:
parent
735e5abb7b
commit
c32d54c949
14
ChangeLog
14
ChangeLog
|
@ -1,3 +1,17 @@
|
||||||
|
2011-05-28 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
|
||||||
|
|
||||||
|
[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 <errno.h> 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 <wl@gnu.org>
|
2011-05-27 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[autofit] Improve tracing of hinting process.
|
[autofit] Improve tracing of hinting process.
|
||||||
|
|
|
@ -149,7 +149,12 @@ FT_BEGIN_HEADER
|
||||||
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
||||||
( defined( __MWERKS__ ) && defined( macintosh ) )
|
( defined( __MWERKS__ ) && defined( macintosh ) )
|
||||||
/* no Carbon frameworks for 64bit 10.4.x */
|
/* 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 <errno.h>
|
||||||
|
#ifdef ECANCELED /* defined since 10.2 */
|
||||||
#include "AvailabilityMacros.h"
|
#include "AvailabilityMacros.h"
|
||||||
|
#endif
|
||||||
#if defined( __LP64__ ) && \
|
#if defined( __LP64__ ) && \
|
||||||
( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
|
( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
|
||||||
#define DARWIN_NO_CARBON 1
|
#define DARWIN_NO_CARBON 1
|
||||||
|
|
|
@ -102,7 +102,12 @@ FT_BEGIN_HEADER
|
||||||
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
||||||
( defined( __MWERKS__ ) && defined( macintosh ) )
|
( defined( __MWERKS__ ) && defined( macintosh ) )
|
||||||
/* no Carbon frameworks for 64bit 10.4.x */
|
/* 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 <errno.h>
|
||||||
|
#ifdef ECANCELED /* defined since 10.2 */
|
||||||
#include "AvailabilityMacros.h"
|
#include "AvailabilityMacros.h"
|
||||||
|
#endif
|
||||||
#if defined( __LP64__ ) && \
|
#if defined( __LP64__ ) && \
|
||||||
( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
|
( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
|
||||||
#define DARWIN_NO_CARBON 1
|
#define DARWIN_NO_CARBON 1
|
||||||
|
|
|
@ -127,7 +127,12 @@ FT_BEGIN_HEADER
|
||||||
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
|
||||||
( defined( __MWERKS__ ) && defined( macintosh ) )
|
( defined( __MWERKS__ ) && defined( macintosh ) )
|
||||||
/* no Carbon frameworks for 64bit 10.4.x */
|
/* 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 <errno.h>
|
||||||
|
#ifdef ECANCELED /* defined since 10.2 */
|
||||||
#include "AvailabilityMacros.h"
|
#include "AvailabilityMacros.h"
|
||||||
|
#endif
|
||||||
#if defined( __LP64__ ) && \
|
#if defined( __LP64__ ) && \
|
||||||
( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
|
( MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 )
|
||||||
#define DARWIN_NO_CARBON 1
|
#define DARWIN_NO_CARBON 1
|
||||||
|
|
Loading…
Reference in New Issue