From 94ada3d81c2c510a6d3558ff19c08b2c38ec5bc3 Mon Sep 17 00:00:00 2001 From: suzuki toshiya Date: Sun, 30 Oct 2011 14:03:13 +0900 Subject: [PATCH] [raccess] Supplement for previous fix. * src/base/ftbase.h (raccess_rule_by_darwin_vfs): Do not declare it on native Mac OS X. * src/base/ftrfork.c (raccess_get_rule_type_from_rule_index): Hide raccess_get_rule_type_from_rule_index() on native Mac OS X too. --- ChangeLog | 10 ++++++++++ src/base/ftbase.h | 5 +++-- src/base/ftrfork.c | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0d86a6353..74415d0aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2011-10-30 suzuki toshiya + + [raccess] Supplement for previous fix. + + * src/base/ftbase.h (raccess_rule_by_darwin_vfs): Do not declare + it on native Mac OS X. + * src/base/ftrfork.c (raccess_get_rule_type_from_rule_index): + Hide raccess_get_rule_type_from_rule_index() on native Mac OS X + too. + 2011-10-30 suzuki toshiya [raccess] Hide raccess_rule_by_darwin_vfs() on native Mac OS X. diff --git a/src/base/ftbase.h b/src/base/ftbase.h index 6375613b2..516f4bb7f 100644 --- a/src/base/ftbase.h +++ b/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 diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c index 707f67cac..33768b0e3 100644 --- a/src/base/ftrfork.c +++ b/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 ) { @@ -427,7 +428,6 @@ } -#if !defined( FT_MACINTOSH ) || defined( DARWIN_NO_CARBON ) FT_LOCAL_DEF( FT_Bool ) raccess_rule_by_darwin_vfs( FT_UInt rule_index ) {