commit be4560a3b5e8599cbe2b29a01a60c21c9e2b194f
author Behdad Esfahbod <behdad@behdad.org> Tue Jun 05 18:14:03 2012 -0400
committer Behdad Esfahbod <behdad@behdad.org> Tue Jun 05 18:43:57 2012 -0400
tree 894c39cf0a8a09b09ec3705dce8a3dc6b8897f2d
parent 093171cceca63e48e735bbf05a2c11b1b7e95ef1

Undo default unicode-funcs to avoid static initializer again

src/hb-unicode.cc

diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index b7a5f8d..e96c0cf 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -103,7 +103,7 @@
 hb_unicode_funcs_t *
 hb_unicode_funcs_get_default (void)
 {
-  return _hb_unicode_funcs_default;
+  return const_cast<hb_unicode_funcs_t *> (&_hb_unicode_funcs_default);
 }
 
 hb_unicode_funcs_t *
@@ -130,21 +130,23 @@
   return ufuncs;
 }
 
+
+extern HB_INTERNAL const hb_unicode_funcs_t _hb_unicode_funcs_nil;
+const hb_unicode_funcs_t _hb_unicode_funcs_nil = {
+  HB_OBJECT_HEADER_STATIC,
+
+  NULL, /* parent */
+  TRUE, /* immutable */
+  {
+#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_nil,
+    HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
+#undef HB_UNICODE_FUNC_IMPLEMENT
+  }
+};
+
 hb_unicode_funcs_t *
 hb_unicode_funcs_get_empty (void)
 {
-  static const hb_unicode_funcs_t _hb_unicode_funcs_nil = {
-    HB_OBJECT_HEADER_STATIC,
-
-    NULL, /* parent */
-    TRUE, /* immutable */
-    {
-#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_nil,
-      HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS
-#undef HB_UNICODE_FUNC_IMPLEMENT
-    }
-  };
-
   return const_cast<hb_unicode_funcs_t *> (&_hb_unicode_funcs_nil);
 }