[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

@@ -1,3 +1,13 @@
+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/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

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