diff options
| author | Werner Lemberg <wl@gnu.org> | 2010-01-14 20:32:21 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2010-01-14 20:32:21 +0100 |
| commit | d40cd0b4a47f14e738f24447e74ea7c19d95abb8 (patch) | |
| tree | a00f02d3ad7108e394761d6eee3a4a959fa3c959 /src/base | |
| parent | 5ebda893c329bb0967e1b7a2ff451fbc7b18caaf (diff) | |
Fix compilation warning.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/ftbase.h | 6 | ||||
| -rw-r--r-- | src/base/ftobjs.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/base/ftbase.h b/src/base/ftbase.h index 9cae85da..1dc49f3b 100644 --- a/src/base/ftbase.h +++ b/src/base/ftbase.h @@ -4,7 +4,7 @@ /* */ /* The FreeType private functions used in base module (specification). */ /* */ -/* Copyright 2008 by */ +/* Copyright 2008, 2010 by */ /* David Turner, Robert Wilhelm, Werner Lemberg, and suzuki toshiya. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -29,7 +29,7 @@ FT_BEGIN_HEADER /* Assume the stream is sfnt-wrapped PS Type1 or sfnt-wrapped CID-keyed */ /* font, and try to load a face specified by the face_index. */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL( FT_Error ) open_face_PS_from_sfnt_stream( FT_Library library, FT_Stream stream, FT_Long face_index, @@ -40,7 +40,7 @@ FT_BEGIN_HEADER /* Create a new FT_Face given a buffer and a driver name. */ /* From ftmac.c. */ - FT_LOCAL_DEF( FT_Error ) + FT_LOCAL( FT_Error ) open_face_from_buffer( FT_Library library, FT_Byte* base, FT_ULong size, diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index c74976a3..e4cbb7d9 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -4,7 +4,8 @@ /* */ /* The FreeType private base classes (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, */ +/* 2010 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -37,7 +38,9 @@ #include FT_SERVICE_KERNING_H #include FT_SERVICE_TRUETYPE_ENGINE_H +#ifdef FT_CONFIG_OPTION_MAC_FONTS #include "ftbase.h" +#endif #define GRID_FIT_METRICS |