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-ucd.cc | |
| parent | 89417ba75b59f26147218af8d08fced7152a80fa (diff) | |
| parent | 3061e3859d603c56b322a6490ebe82db40475d83 (diff) | |
Merge pull request #52859 from bruvzg/hb300
Diffstat (limited to 'thirdparty/harfbuzz/src/hb-ucd.cc')
| -rw-r--r-- | thirdparty/harfbuzz/src/hb-ucd.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/thirdparty/harfbuzz/src/hb-ucd.cc b/thirdparty/harfbuzz/src/hb-ucd.cc index ad72a26c04..baea224a25 100644 --- a/thirdparty/harfbuzz/src/hb-ucd.cc +++ b/thirdparty/harfbuzz/src/hb-ucd.cc @@ -203,9 +203,7 @@ hb_ucd_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, } -#if HB_USE_ATEXIT static void free_static_ucd_funcs (); -#endif static struct hb_ucd_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_t<hb_ucd_unicode_funcs_lazy_loader_t> { @@ -222,21 +220,17 @@ static struct hb_ucd_unicode_funcs_lazy_loader_t : hb_unicode_funcs_lazy_loader_ hb_unicode_funcs_make_immutable (funcs); -#if HB_USE_ATEXIT - atexit (free_static_ucd_funcs); -#endif + hb_atexit (free_static_ucd_funcs); return funcs; } } static_ucd_funcs; -#if HB_USE_ATEXIT -static +static inline void free_static_ucd_funcs () { static_ucd_funcs.free_instance (); } -#endif hb_unicode_funcs_t * hb_ucd_get_unicode_funcs () |