ref: 1ffb911d5067cb0e2be0f2844d4369bf33624d8c
parent: bf7c8321f253d7e040fb4e2dca56a163fd6ad63c
author: Werner Lemberg <[email protected]>
date: Fri Jun 6 08:47:59 EDT 2003
* src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]: Add `#if !defined(__MWERKS__)'.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-05 Wenlin Institute (Tom Bishop) <[email protected]>
+
+ * src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]:
+ Add `#if !defined(__MWERKS__)'.
+
2003-06-05 Werner Lemberg <[email protected]>
* include/freetype/internal/psaux.h (T1_FieldType): Add
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -108,8 +108,8 @@
/* This is the only necessary change, so it is defined here instead */
/* providing a new configuration file. */
/* */
-#if ( defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON ) ) || \
- ( defined( __MWERKS__ ) && defined( macintosh ) )
+#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
+ ( defined( __MWERKS__ ) && defined( macintosh ) )
#define FT_MACINTOSH 1
#endif
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -92,7 +92,7 @@
file_spec_from_path( const char* pathname,
FSSpec* spec )
{-#if TARGET_API_MAC_CARBON
+#if defined( TARGET_API_MAC_CARBON ) && !defined( __MWERKS__ )
OSErr e;
FSRef ref;
@@ -140,7 +140,7 @@
}
-#if TARGET_API_MAC_CARBON
+#ifdef TARGET_API_MAC_CARBON
/* is this a Mac OS X .dfont file */
static Boolean
@@ -662,7 +662,7 @@
}
-#if TARGET_API_MAC_CARBON
+#ifdef TARGET_API_MAC_CARBON
/* Create a new FT_Face from a file spec to a suitcase file. */
static FT_Error
@@ -908,7 +908,7 @@
return FT_New_Face_From_LWFN( library, &spec, face_index, aface );
}
-#if TARGET_API_MAC_CARBON
+#ifdef TARGET_API_MAC_CARBON
if ( is_dfont( &spec ) )
return FT_New_Face_From_dfont( library, &spec, face_index, aface );