diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-09-20 10:02:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-20 10:02:53 +0200 |
| commit | 2f6abc1002bbb82ba0f4285076e880e20fad4388 (patch) | |
| tree | 9eba4712d3e85919dc9dc5756dd6ef172b27a587 /thirdparty/harfbuzz/src/hb-icu.cc | |
| parent | 89417ba75b59f26147218af8d08fced7152a80fa (diff) | |
| parent | 3061e3859d603c56b322a6490ebe82db40475d83 (diff) | |
Merge pull request #52859 from bruvzg/hb300
Diffstat (limited to 'thirdparty/harfbuzz/src/hb-icu.cc')
| -rw-r--r-- | thirdparty/harfbuzz/src/hb-icu.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/thirdparty/harfbuzz/src/hb-icu.cc b/thirdparty/harfbuzz/src/hb-icu.cc index 008a39e414..e46401f7a6 100644 --- a/thirdparty/harfbuzz/src/hb-icu.cc +++ b/thirdparty/harfbuzz/src/hb-icu.cc @@ -233,9 +233,7 @@ hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, } -#if HB_USE_ATEXIT -static void free_static_icu_funcs (); -#endif +static inline void free_static_icu_funcs (); static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_t<hb_icu_unicode_funcs_lazy_loader_t> { @@ -257,21 +255,17 @@ static struct hb_icu_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_ hb_unicode_funcs_make_immutable (funcs); -#if HB_USE_ATEXIT - atexit (free_static_icu_funcs); -#endif + hb_atexit (free_static_icu_funcs); return funcs; } } static_icu_funcs; -#if HB_USE_ATEXIT -static +static inline void free_static_icu_funcs () { static_icu_funcs.free_instance (); } -#endif /** * hb_icu_get_unicode_funcs: |