diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-18 15:38:32 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-18 15:38:32 +0100 |
| commit | ac36cb2c0db123b18d83f59d011d83b299edea63 (patch) | |
| tree | c513e767ebfb36c8439b87eec7853198cc0387af /freetype/src/base/ftbase.h | |
| parent | 7a750103eafc49dd7ee461b6f5efb41a93174056 (diff) | |
| parent | 1037d56ca89d503cfd62830a90e934a2806ad804 (diff) | |
| download | vcxsrv-ac36cb2c0db123b18d83f59d011d83b299edea63.tar.gz vcxsrv-ac36cb2c0db123b18d83f59d011d83b299edea63.tar.bz2 vcxsrv-ac36cb2c0db123b18d83f59d011d83b299edea63.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'freetype/src/base/ftbase.h')
| -rw-r--r-- | freetype/src/base/ftbase.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/freetype/src/base/ftbase.h b/freetype/src/base/ftbase.h index 5ab258764..a13fe595b 100644 --- a/freetype/src/base/ftbase.h +++ b/freetype/src/base/ftbase.h @@ -49,7 +49,8 @@ FT_BEGIN_HEADER FT_Face *aface ); -#ifdef FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK +#if defined( FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK ) && \ + ( !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON ) ) /* Mac OS X/Darwin kernel often changes recommended method to access */ /* the resource fork and older methods makes the kernel issue the */ /* warning of deprecated method. To calm it down, the methods based */ @@ -57,7 +58,7 @@ FT_BEGIN_HEADER /* the case the resource is opened but found to lack a font in it. */ FT_LOCAL( FT_Bool ) raccess_rule_by_darwin_vfs( FT_UInt rule_index ); -#endif /* FT_CONFIG_OPTION_GUESSING_EMBEDDED_RFORK */ +#endif FT_END_HEADER |