ref: b2c40b5bba9a6033f876f30bc70257551717279e
parent: 009ce1aba8f9aed1703cd44538230263e01262bc
author: Werner Lemberg <wl@gnu.org>
date: Sat Aug 28 04:02:46 EDT 2004
* 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.
--- 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.
--- a/src/base/ftmac.c
+++ b/src/base/ftmac.c
@@ -63,9 +63,7 @@
#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. */
@@ -72,8 +70,6 @@
#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() */
--
⑨