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/ftrfork.c | |
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/ftrfork.c')
-rw-r--r-- | freetype/src/base/ftrfork.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/freetype/src/base/ftrfork.c b/freetype/src/base/ftrfork.c index c94cdd86d..fbbb3c8e6 100644 --- a/freetype/src/base/ftrfork.c +++ b/freetype/src/base/ftrfork.c @@ -417,6 +417,7 @@ } +#if !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON ) static FT_RFork_Rule raccess_get_rule_type_from_rule_index( FT_UInt rule_index ) { @@ -440,6 +441,7 @@ return FALSE; } } +#endif static FT_Error |