mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Check ANSI compatibility of Mac OS X system header

Browse Source
This commit is contained in:
Suzuki, Toshiya (鈴木俊哉) 2007-02-05 02:50:45 +00:00
parent da5ada5def
commit 027357f1c8
3 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/mac/ftmac.c
View File

@ -70,8 +70,10 @@
/* This is for Mac OS X. Without redefinition, OS_INLINE */
/* expands to `static inline' which doesn't survive the */
/* -ansi compilation flag of GCC. */
#if !HAVE_ANSI_OS_INLINE
#undef OS_INLINE
#define OS_INLINE static __inline__
#endif
#include <Carbon/Carbon.h>
#else
#include <Resources.h>

29
builds/unix/configure.raw
View File

@ -199,7 +199,34 @@ if test x$with_old_mac_fonts = xyes; then
UseResFile( res );
],
[AC_MSG_RESULT([ok])],
[AC_MSG_RESULT([ok])
AC_MSG_CHECKING([OS_INLINE macro is ANSI compatible])
orig_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $XX_CFLAGS $XX_ANSIFLAGS"
AC_TRY_COMPILE([
#if defined(__GNUC__) && defined(__APPLE_CC__)
# include <Carbon/Carbon.h>
# include <ApplicationServices/ApplicationServices.h>
#else
# include <ConditionalMacros.h>
# include <Files.h>
#endif
],
[
/* OSHostByteOrder() is typed as 'OS_INLINE' */
int32_t os_byte_order = OSHostByteOrder();
if ( OSBigEndian != os_byte_order )
return 1;
],
[
AC_MSG_RESULT([ok])
CFLAGS="$orig_CFLAGS"
CFLAGS="$CFLAGS -DHAVE_ANSI_OS_INLINE=1"
],[
AC_MSG_RESULT([no, ANSI incompatible])
CFLAGS="$orig_CFLAGS"
])
],
[AC_MSG_RESULT([not found])
LDFLAGS="${orig_LDFLAGS}"
CFLAGS="$CFLAGS -DDARWIN_NO_CARBON"])

2
src/base/ftmac.c
View File

@ -72,8 +72,10 @@
/* This is for Mac OS X. Without redefinition, OS_INLINE */
/* expands to `static inline' which doesn't survive the */
/* -ansi compilation flag of GCC. */
#if !HAVE_ANSI_OS_INLINE
#undef OS_INLINE
#define OS_INLINE static __inline__
#endif
#include <Carbon/Carbon.h>
#ifndef HFS_MAXPATHLEN