Index: ChangeLog
===================================================================
RCS file: /sources/freetype/freetype2/ChangeLog,v
retrieving revision 1.1756
diff -r1.1756 ChangeLog
710,712c710,713
< 	* src/base/ftmac.c: Use essential header files <Carbon/Carbon.h>
< 	and <ApplicationServices/ApplicationServices.h> instead of
< 	all-in-one header file <CoreServices/CoreServices.h>.
---
> 	* src/base/ftmac.c: Use essential header files
> 	<CoreServices/CoreServices.h> and
> 	<ApplicationServices/ApplicationServices.h> instead of
> 	all-in-one header file <Carbon/Carbon.h>.
Index: builds/unix/configure.raw
===================================================================
RCS file: /sources/freetype/freetype2/builds/unix/configure.raw,v
retrieving revision 1.28
diff -r1.28 configure.raw
214,220c214,215
< #if defined(__GNUC__) && defined(__APPLE_CC__)
< # include <Carbon/Carbon.h>
< # include <ApplicationServices/ApplicationServices.h>
< #else
< # include <ConditionalMacros.h>
< # include <Files.h>
< #endif
---
> #include <CoreServices/CoreServices.h>
> #include <ApplicationServices/ApplicationServices.h>
263,284d257
<        ])
<      AC_MSG_CHECKING([type ResourceIndex])
<      orig_CFLAGS="$CFLAGS"
<      CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS"
<      AC_COMPILE_IFELSE([
<        AC_LANG_PROGRAM([
< 
< #if defined(__GNUC__) && defined(__APPLE_CC__)
< # include <Carbon/Carbon.h>
< # include <ApplicationServices/ApplicationServices.h>
< #else
< # include <ConditionalMacros.h>
< # include <Files.h>
< # include <Resources.h>
< #endif
< 
<          ],
<          [
< 
<            ResourceIndex i = 0;
<            return i;
< 
286,293d258
<        [AC_MSG_RESULT([ok])
<         CFLAGS="$orig_CFLAGS"
<         CFLAGS="$CFLAGS -DHAVE_TYPE_RESOURCE_INDEX"
<        ],
<        [AC_MSG_RESULT([no])
<         CFLAGS="$orig_CFLAGS"
<        ])
<     ],
Index: src/base/ftmac.c
===================================================================
RCS file: /sources/freetype/freetype2/src/base/ftmac.c,v
retrieving revision 1.67
diff -r1.67 ftmac.c
80,81c80,82
<   /* The ResourceIndex type was available SDKs on 10.5 */
< #ifndef HAVE_TYPE_RESOURCE_INDEX
---
>   /* The ResourceIndex type was introduced in the 10.5 SDK. */
>   /* If an older SDK is being used, define ResourceIndex.   */
> #if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
136,137c137
< #if defined( MAC_OS_X_VERSION_10_5 ) && \
<     ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 )
---
> #if ( MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 )
237,238c237
< #if ( __LP64__ ) || ( defined( MAC_OS_X_VERSION_10_5 ) && \
<       ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ) )
---
> #if ( __LP64__ ) || ( MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 )
1110,1111c1109
< #if ( __LP64__ ) || ( defined( MAC_OS_X_VERSION_10_5 ) && \
<       ( MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 ) )
---
> #if ( __LP64__ ) || ( MAC_OS_X_VERSION_MIN_REQUIRED >= 1050 )