rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
This commit is contained in:
Werner Lemberg 2004-08-28 08:02:46 +00:00
parent 703e85c11e
commit 3dde21bd63
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
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.

10
src/base/ftmac.c
View File

@ -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() */