[svn:parrot] r48186 - branches/gsoc_nfg/src/string/encoding

[darbelo at svn.parrot.org]

Author: darbelo
Date: Tue Jul 27 19:01:17 2010
New Revision: 48186
URL: https://trac.parrot.org/parrot/changeset/48186

Log:
Make the existance of the NFG hashing function's existance not depend on PARROT_HAS_ICU.

Modified:
   branches/gsoc_nfg/src/string/encoding/nfg.c

Modified: branches/gsoc_nfg/src/string/encoding/nfg.c
==============================================================================
--- branches/gsoc_nfg/src/string/encoding/nfg.c	Tue Jul 27 15:02:21 2010	(r48185)
+++ branches/gsoc_nfg/src/string/encoding/nfg.c	Tue Jul 27 19:01:17 2010	(r48186)
@@ -587,7 +587,6 @@
 #endif
 }
 
-#if PARROT_HAS_ICU
 /*
 
 =item C<static size_t nfg_hash(PARROT_INTERP, const STRING *s, size_t hashval)>
@@ -602,6 +601,7 @@
 nfg_hash(PARROT_INTERP, ARGIN(const STRING *s), size_t hashval)
 {
     ASSERT_ARGS(nfg_hash)
+#if PARROT_HAS_ICU
     const UChar32 *pos = (const UChar32*) s->strstart;
     UINTVAL len = s->strlen;
     UNUSED(interp);
@@ -612,8 +612,12 @@
     }
 
     return hashval;
-}
+#else
+    UNUSED(s);
+    UNUSED(hashval);
+    no_ICU_lib(interp);
 #endif
+}
 
 /*
 
@@ -698,11 +702,7 @@
         bytes,
         iter_init,
         find_cclass,
-#if PARROT_HAS_ICU
         nfg_hash
-#else
-        NULL
-#endif
     };
     STRUCT_COPY_FROM_STRUCT(return_encoding, base_encoding);
     Parrot_register_encoding(interp, "nfg", return_encoding);