mirrors/freetype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes.

Browse Source 
* src/base/ftdbgmem.c (_debug_mem_dummy): Make it static.

* src/base/ftmac.c: Remove some #undefs.
This commit is contained in:
Werner Lemberg 2009-01-06 06:59:36 +00:00
parent 1ad384d881
commit f2e33c1111
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,9 @@
2009-01-06 Sean McBride <sean@rogue-research.com>
* src/base/ftdbgmem.c (_debug_mem_dummy): Make it static.
* src/base/ftmac.c: Remove some #undefs.
2008-12-26 Werner Lemberg <wl@gnu.org>
Set `face_index' field in FT_Face for all font formats.
@ -1678,9 +1684,10 @@
Carbon functions from a forked process is classified as unsafe
by Apple. All Carbon-dependent functions should be deprecated.
* src/base/ftmac.c: Use essential header files <Carbon/Carbon.h>
and <ApplicationServices/ApplicationServices.h> instead of
all-in-one header file <CoreServices/CoreServices.h>.
* src/base/ftmac.c: Use essential header files
<CoreServices/CoreServices.h> and
<ApplicationServices/ApplicationServices.h> instead of
all-in-one header file <Carbon/Carbon.h>.
Include <sys/syslimits.h> and replace HFS_MAXPATHLEN by Apple
genuine macro PATH_MAX.
@ -4427,7 +4434,7 @@
----------------------------------------------------------------------------
Copyright 2006, 2007, 2008 by
Copyright 2006, 2007, 2008, 2009 by
David Turner, Robert Wilhelm, and Werner Lemberg.
This file is part of the FreeType project, and may only be used, modified,

4
src/base/ftdbgmem.c
View File

@ -4,7 +4,7 @@
/* */
/* Memory debugger (body). */
/* */
/* Copyright 2001, 2002, 2003, 2004, 2005, 2006 by */
/* Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2009 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -990,7 +990,7 @@
#else /* !FT_DEBUG_MEMORY */
/* ANSI C doesn't like empty source files */
const FT_Byte _debug_mem_dummy = 0;
static const FT_Byte _debug_mem_dummy = 0;
#endif /* !FT_DEBUG_MEMORY */

15
src/base/ftmac.c
View File

@ -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,