[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-unicode.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit af1aa362cacc652ab8ffda05a5d98a3ff5430439
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Mar 14 15:52:47 2014 -0700

    If HAVE_ICU_BUILTIN is defined, use hb-icu Unicode callbacks
    
    Useful for Android / Chrome / etc when ICU is built in the same
    library as harfbuzz itself.

diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index 5b44913..ed99ca2 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -133,7 +133,7 @@ hb_unicode_funcs_get_default (void)
 
 #ifdef HAVE_GLIB
   HB_UNICODE_FUNCS_IMPLEMENT(glib)
-#elif 0 && defined(HAVE_ICU)
+#elif defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN)
   HB_UNICODE_FUNCS_IMPLEMENT(icu)
 #elif defined(HAVE_UCDN)
   HB_UNICODE_FUNCS_IMPLEMENT(ucdn)