diff options
| author | Werner Lemberg <wl@gnu.org> | 2009-01-06 06:59:36 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2009-01-06 06:59:36 +0000 |
| commit | f2e33c1111c2f7f0021c556df85401f63e4f1f15 (patch) | |
| tree | 3b22d854ab105b461341fa256100a18de0ccb6cb /src/base/ftmac.c | |
| parent | 1ad384d8818e0b0da95b069d5874da6f7ec51558 (diff) | |
Minor fixes.
* src/base/ftdbgmem.c (_debug_mem_dummy): Make it static.
* src/base/ftmac.c: Remove some #undefs.
Diffstat (limited to 'src/base/ftmac.c')
| -rw-r--r-- | src/base/ftmac.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/base/ftmac.c b/src/base/ftmac.c index e96c88b1..63f927d5 100644 --- a/src/base/ftmac.c +++ b/src/base/ftmac.c @@ -8,7 +8,8 @@ /* This file is for Mac OS X only; see builds/mac/ftoldmac.c for */ /* classic platforms built by MPW. */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, */ +/* 2009 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -100,17 +101,11 @@ #include <ApplicationServices/ApplicationServices.h> #include <sys/syslimits.h> /* PATH_MAX */ + /* Don't want warnings about our own use of deprecated functions. */ #define FT_DEPRECATED_ATTRIBUTE #include FT_MAC_H - /* undefine blocking-macros in ftmac.h */ -#undef FT_GetFile_From_Mac_Name( a, b, c ) -#undef FT_GetFile_From_Mac_ATS_Name( a, b, c ) -#undef FT_New_Face_From_FOND( a, b, c, d ) -#undef FT_New_Face_From_FSSpec( a, b, c, d ) -#undef FT_New_Face_From_FSRef( a, b, c, d ) - #ifndef kATSOptionFlagsUnRestrictedScope /* since Mac OS X 10.1 */ #define kATSOptionFlagsUnRestrictedScope kATSOptionFlagsDefault #endif @@ -694,7 +689,7 @@ } - /* Create a new FT_Face from a file spec to an LWFN file. */ + /* Create a new FT_Face from a file path to an LWFN file. */ static FT_Error FT_New_Face_From_LWFN( FT_Library library, const UInt8* pathname, @@ -793,7 +788,7 @@ } - /* Create a new FT_Face from a file spec to a suitcase file. */ + /* Create a new FT_Face from a file path to a suitcase file. */ static FT_Error FT_New_Face_From_Suitcase( FT_Library library, const UInt8* pathname, |