From b111b3de020cde6fb0686efc224cace4608f2e45 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 10 Apr 2019 15:38:15 -0400 Subject: [PATCH] Don't use any default unicode funcs if HB_NO_UNICODE_FUNCS is defined Part of https://github.com/harfbuzz/harfbuzz/issues/1652 --- src/hb-unicode.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc index 4ac521d38..d32cace64 100644 --- a/src/hb-unicode.cc +++ b/src/hb-unicode.cc @@ -130,11 +130,11 @@ extern "C" hb_unicode_funcs_t *hb_ucdn_get_unicode_funcs (); hb_unicode_funcs_t * hb_unicode_funcs_get_default () { -#if defined(HAVE_UCDN) +#if !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_UCDN) return hb_ucdn_get_unicode_funcs (); -#elif defined(HAVE_GLIB) +#elif !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_GLIB) return hb_glib_get_unicode_funcs (); -#elif defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN) +#elif !defined(HB_NO_UNICODE_FUNCS) && defined(HAVE_ICU) && defined(HAVE_ICU_BUILTIN) return hb_icu_get_unicode_funcs (); #else #define HB_UNICODE_FUNCS_NIL 1