Commit b2c40b5bba9a6033f876f30bc70257551717279e
2004-08-28T08:02:46
* src/base/ftmac.c: Don't include truetype/ttobjs.h. Don't include type1/t1objs.h. (FT_New_Face_From_FSSpec) [!__MWERKS__]: Remove compiler warnings.
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
diff --git a/ChangeLog b/ChangeLog
index 1ccb500..66f5bc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2004-08-27 Werner Lemberg <wl@gnu.org>
+ * src/base/ftmac.c: Don't include truetype/ttobjs.h.
+ Don't include type1/t1objs.h.
+ (FT_New_Face_From_FSSpec) [!__MWERKS__]: Remove compiler warnings.
+
+2004-08-27 Mathieu Malaterre <mathieu@malaterre.com>
+
+ * src/base/ftmac.c: Handle OS_INLINE for xlc compiler also.
+
+2004-08-27 Werner Lemberg <wl@gnu.org>
+
* src/otlayout/otlayout.h: Add copyright.
(OTL_INVALID_OFFSET): Removed.
diff --git a/src/base/ftmac.c b/src/base/ftmac.c
index c714753..0c45372 100644
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -63,17 +63,13 @@
#include FT_FREETYPE_H
#include FT_INTERNAL_STREAM_H
-#ifdef __GNUC__
-#include "../truetype/ttobjs.h"
-#include "../type1/t1objs.h"
+#if defined( __GNUC__ ) || defined( __IBMC__ )
/* This is for Mac OS X. Without redefinition, OS_INLINE */
/* expands to `static inline' which doesn't survive the */
/* -ansi compilation flag of GCC. */
#define OS_INLINE static __inline__
#include <Carbon/Carbon.h>
#else
-#include "truetype/ttobjs.h"
-#include "type1/t1objs.h"
#include <Resources.h>
#include <Fonts.h>
#include <Errors.h>
@@ -1012,11 +1008,13 @@
FT_Long face_index,
FT_Face *aface )
{
+#if defined( __MWERKS__ ) && !TARGET_RT_MAC_MACHO
FT_Open_Args args;
- FT_Error error;
FT_Stream stream;
FILE* file;
FT_Memory memory;
+#endif
+ FT_Error error;
/* test for valid `library' and `aface' delayed to FT_Open_Face() */