aboutsummaryrefslogtreecommitdiff
path: root/freetype/src/base/ftrfork.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-18 15:38:32 +0100
committermarha <marha@users.sourceforge.net>2011-11-18 15:38:32 +0100
commitac36cb2c0db123b18d83f59d011d83b299edea63 (patch)
treec513e767ebfb36c8439b87eec7853198cc0387af /freetype/src/base/ftrfork.c
parent7a750103eafc49dd7ee461b6f5efb41a93174056 (diff)
parent1037d56ca89d503cfd62830a90e934a2806ad804 (diff)
downloadvcxsrv-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.c2
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