From 2e7021da7d1726a37822e6a001b9218f82255bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= Date: Mon, 8 Jul 2019 10:19:49 +0300 Subject: [PATCH] Revert "Minor" - revert moving extern "C" definitions in-function This reverts commit 62e60322cb9e18b3ee75f1b4a2a6d3069f587407 since it breaks building HarfBuzz as part of Chromium. Fixes https://github.com/harfbuzz/harfbuzz/issues/1821. --- src/hb-unicode.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc index 663415b26..e2deaa240 100644 --- a/src/hb-unicode.cc +++ b/src/hb-unicode.cc @@ -126,16 +126,17 @@ hb_unicode_decompose_compatibility_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED } #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_get_default () { #if !defined(HB_NO_UNICODE_FUNCS) && !defined(HB_NO_UCD) return hb_ucd_get_unicode_funcs (); #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 (); #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 (); #else #define HB_UNICODE_FUNCS_NIL 1