diff options
| author | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-10-30 14:03:13 +0900 |
|---|---|---|
| committer | suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> | 2011-10-30 14:03:13 +0900 |
| commit | 94ada3d81c2c510a6d3558ff19c08b2c38ec5bc3 (patch) | |
| tree | 286f2355e5dd21815ac4219ec3c5b3345d707f57 | |
| parent | dbe330bca9d80efba8fa43fd2c08e44ca7071df8 (diff) | |
| download | freetype2-94ada3d81c2c510a6d3558ff19c08b2c38ec5bc3.tar.gz | |
[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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/base/ftbase.h | 5 | ||||
| -rw-r--r-- | src/base/ftrfork.c | 2 |
3 files changed, 14 insertions, 3 deletions
@@ -1,5 +1,15 @@ 2011-10-30 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> + [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 <mpsuzuki@hiroshima-u.ac.jp> + [raccess] Hide raccess_rule_by_darwin_vfs() on native Mac OS X. * src/base/ftrfork.c (raccess_rule_by_darwin_vfs): Do not 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 ) { |