minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]: 

Add `#if !defined(__MWERKS__)'.
This commit is contained in:
Werner Lemberg 2003-06-06 12:47:59 +00:00
parent 31d783b1d0
commit 1f6cbfd6bb
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2003-06-05 Wenlin Institute (Tom Bishop) <wenlin@wenlin.com>
* src/base/ftmac.c (file_spec_from_path) [TARGET_API_MAC_CARBON]:
Add `#if !defined(__MWERKS__)'.
2003-06-05 Werner Lemberg <wl@gnu.org>
* include/freetype/internal/psaux.h (T1_FieldType): Add

4
include/freetype/config/ftconfig.h
View File

@ -108,8 +108,8 @@ FT_BEGIN_HEADER
/* This is the only necessary change, so it is defined here instead */
/* providing a new configuration file. */
/* */
#if ( defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON ) ) || \
( defined( __MWERKS__ ) && defined( macintosh ) )
#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
( defined( __MWERKS__ ) && defined( macintosh ) )
#define FT_MACINTOSH 1
#endif

8
src/base/ftmac.c
View File

@ -92,7 +92,7 @@
file_spec_from_path( const char* pathname,
FSSpec* spec )
{
#if TARGET_API_MAC_CARBON
#if defined( TARGET_API_MAC_CARBON ) && !defined( __MWERKS__ )
OSErr e;
FSRef ref;
@ -140,7 +140,7 @@
}
#if TARGET_API_MAC_CARBON
#ifdef TARGET_API_MAC_CARBON
/* is this a Mac OS X .dfont file */
static Boolean
@ -662,7 +662,7 @@
}
#if TARGET_API_MAC_CARBON
#ifdef TARGET_API_MAC_CARBON
/* Create a new FT_Face from a file spec to a suitcase file. */
static FT_Error
@ -908,7 +908,7 @@
return FT_New_Face_From_LWFN( library, &spec, face_index, aface );
}
#if TARGET_API_MAC_CARBON
#ifdef TARGET_API_MAC_CARBON
if ( is_dfont( &spec ) )
return FT_New_Face_From_dfont( library, &spec, face_index, aface );