Commit 1ffb911d5067cb0e2be0f2844d4369bf33624d8c
2003-06-06T12:47:59
* src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]: Add `#if !defined(__MWERKS__)'.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
diff --git a/ChangeLog b/ChangeLog
index 2e6b1db..12af1bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-06-05 Wenlin Institute (Tom Bishop) <wenlin@wenlin.com>
+
+ * src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]:
+ Add `#if !defined(__MWERKS__)'.
+
2003-06-05 Werner Lemberg <wl@gnu.org>
* include/freetype/internal/psaux.h (T1_FieldType): Add
diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h
index 705539a..70f5026 100644
--- a/include/freetype/config/ftconfig.h
+++ b/include/freetype/config/ftconfig.h
@@ -108,8 +108,8 @@ FT_BEGIN_HEADER
/* 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
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index cbc5072..2b29882 100644
--- 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 );