AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Minor" - revert moving extern "C" definitions in-function

Browse Source 
This reverts commit 62e60322cb since it
breaks building HarfBuzz as part of Chromium.

Fixes https://github.com/harfbuzz/harfbuzz/issues/1821.
This commit is contained in:
Dominik Röttsches 2019-07-08 10:19:49 +03:00
parent f18ea1dd3a
commit 2e7021da7d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/hb-unicode.cc
View File

@ -126,16 +126,17 @@ hb_unicode_decompose_compatibility_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED
} }
#endif #endif
extern "C" hb_unicode_funcs_t *hb_glib_get_unicode_funcs ();
extern "C" hb_unicode_funcs_t *hb_icu_get_unicode_funcs ();
hb_unicode_funcs_t * hb_unicode_funcs_t *
hb_unicode_funcs_get_default () hb_unicode_funcs_get_default ()
{ {
#if !defined(HB_NO_UNICODE_FUNCS) && !defined(HB_NO_UCD) #if !defined(HB_NO_UNICODE_FUNCS) && !defined(HB_NO_UCD)
return hb_ucd_get_unicode_funcs (); return hb_ucd_get_unicode_funcs ();
#elif !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_GLIB) #elif !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_GLIB)
extern "C" hb_unicode_funcs_t *hb_glib_get_unicode_funcs ();
return hb_glib_get_unicode_funcs (); return hb_glib_get_unicode_funcs ();
#elif !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN) #elif !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN)
extern "C" hb_unicode_funcs_t *hb_icu_get_unicode_funcs ();
return hb_icu_get_unicode_funcs (); return hb_icu_get_unicode_funcs ();
#else #else
#define HB_UNICODE_FUNCS_NIL 1 #define HB_UNICODE_FUNCS_NIL 1