shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[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.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,15 @@

 2011-10-30  suzuki toshiya  <[email protected]>

+	[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  <[email protected]>

+

 	[raccess] Hide raccess_rule_by_darwin_vfs() on native Mac OS X.

 	* src/base/ftrfork.c (raccess_rule_by_darwin_vfs): Do not

--- a/src/base/ftbase.h

+++ b/src/base/ftbase.h

@@ -49,7 +49,8 @@

                          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 @@

   /* 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

--- 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 )

   {