ref: 849bde1fa0296a107e597d2f8b57918d072e287c
parent: 6b19fd5c14883f36f5e7e177d9c1acd2fa7759c9
parent: c32d54c94950fc086e5c6943313a3d31b4e0873d
author: Werner Lemberg <[email protected]>
date: Mon May 30 03:29:04 EDT 2011
Merge branch 'master' of git.sv.gnu.org:/srv/git/freetype/freetype2 Conflicts: ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,20 @@
* src/smooth/ftsmooth.c (ft_smooth_render_generic): Use `height_org'
and `width_org' conditionalized.
+2011-05-28 suzuki toshiya <[email protected]>
+
+ [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 <[email protected]>
[autofit] Improve tracing of hinting process.
--- a/builds/unix/ftconfig.in
+++ b/builds/unix/ftconfig.in
@@ -149,7 +149,12 @@
#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 <errno.h>
+#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
--- a/builds/vms/ftconfig.h
+++ b/builds/vms/ftconfig.h
@@ -102,7 +102,12 @@
#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 <errno.h>
+#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
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -127,7 +127,12 @@
#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 <errno.h>
+#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