diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:31:51 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-22 22:31:51 +0200 |
commit | 67934c103800bae50c2ec1977758d40fa8e4e507 (patch) | |
tree | 77a44eb54a75a35bd10f3c63be588889b697e451 /src/3rdparty/harfbuzz-ng/src/hb-icu.cc | |
parent | 694575a59b5370afc494fbf700eee8db1d1ec091 (diff) | |
parent | ca128e25119c0b259d083567c796bfa67b100a42 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource
Conflicts solved in a file:
src/corelib/io/qstandardpaths_android.cpp
Change-Id: Ie8cef36c1379679ca358df50c56b3c25aa15c5d6
Diffstat (limited to 'src/3rdparty/harfbuzz-ng/src/hb-icu.cc')
-rw-r--r-- | src/3rdparty/harfbuzz-ng/src/hb-icu.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/3rdparty/harfbuzz-ng/src/hb-icu.cc b/src/3rdparty/harfbuzz-ng/src/hb-icu.cc index 008a39e414..e46401f7a6 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-icu.cc +++ b/src/3rdparty/harfbuzz-ng/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: |