diff options
Diffstat (limited to 'builds/unix/ftconfig.h.in')
| -rw-r--r-- | builds/unix/ftconfig.h.in | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/builds/unix/ftconfig.h.in b/builds/unix/ftconfig.h.in index c506ba278..141ecf34e 100644 --- a/builds/unix/ftconfig.h.in +++ b/builds/unix/ftconfig.h.in @@ -50,7 +50,7 @@ #endif /* FT_USE_AUTOCONF_SIZEOF_TYPES */ #include <freetype/config/integer-types.h> - +#include <freetype/config/mac-support.h> FT_BEGIN_HEADER @@ -76,47 +76,6 @@ FT_BEGIN_HEADER #endif - /************************************************************************** - * - * AUTOMATIC CONFIGURATION MACROS - * - * These macros are computed from the ones defined above. Don't touch - * their definition, unless you know precisely what you are doing. No - * porter should need to mess with them. - * - */ - - - /************************************************************************** - * - * Mac support - * - * This is the only necessary change, so it is defined here instead - * providing a new configuration file. - */ -#if defined( __APPLE__ ) || ( defined( __MWERKS__ ) && defined( macintosh ) ) - /* No Carbon frameworks for 64bit 10.4.x. */ - /* `AvailabilityMacros.h` is available 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 ) -#undef FT_MACINTOSH -#endif - -#elif defined( __SC__ ) || defined( __MRC__ ) - /* Classic MacOS compilers */ -#include "ConditionalMacros.h" -#if TARGET_OS_MAC -#define FT_MACINTOSH 1 -#endif - -#endif - - /* Fix compiler warning with sgi compiler. */ #if defined( __sgi ) && !defined( __GNUC__ ) #if defined( _COMPILER_VERSION ) && ( _COMPILER_VERSION >= 730 ) |