src/hb-common.cc | 2 +- src/hb-ft.cc | 4 +++- src/hb-shape.cc | 4 +++- src/hb-shaper.cc | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-)
New commits: commit 8cb41cb9508eb1bb6319e92f900cfe5e8a131be3 Merge: 365c03f fb85d61 Author: Behdad Esfahbod <[email protected]> Date: Sun Jan 4 20:32:18 2015 -0800 Merge pull request #76 from cpeterso/cpeterso/Wunused-function Add #ifdef HB_USE_ATEXIT to fix -Wunused-function warnings commit fb85d618f5883458bacf0ecb0894772291a2d738 Author: Chris Peterson <[email protected]> Date: Sun Jan 4 19:31:10 2015 -0800 Add #ifdef HB_USE_ATEXIT to fix -Wunused-function warnings diff --git a/src/hb-common.cc b/src/hb-common.cc index d308f36..8837cef 100644 --- a/src/hb-common.cc +++ b/src/hb-common.cc @@ -235,7 +235,7 @@ struct hb_language_item_t { static hb_language_item_t *langs; #ifdef HB_USE_ATEXIT -static inline +static void free_langs (void) { while (langs) { diff --git a/src/hb-ft.cc b/src/hb-ft.cc index 883f26f..7e75ba9 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -467,11 +467,13 @@ hb_ft_font_create_referenced (FT_Face ft_face) static FT_Library ft_library; -static inline +#ifdef HB_USE_ATEXIT +static void free_ft_library (void) { FT_Done_FreeType (ft_library); } +#endif static FT_Library get_ft_library (void) diff --git a/src/hb-shape.cc b/src/hb-shape.cc index 74747f8..100fb3c 100644 --- a/src/hb-shape.cc +++ b/src/hb-shape.cc @@ -279,11 +279,13 @@ hb_feature_to_string (hb_feature_t *feature, static const char **static_shaper_list; -static inline +#ifdef HB_USE_ATEXIT +static void free_static_shaper_list (void) { free (static_shaper_list); } +#endif /** * hb_shape_list_shapers: diff --git a/src/hb-shaper.cc b/src/hb-shaper.cc index 6ae2601..580b95c 100644 --- a/src/hb-shaper.cc +++ b/src/hb-shaper.cc @@ -40,12 +40,14 @@ static const hb_shaper_pair_t all_shapers[] = { static const hb_shaper_pair_t *static_shapers; -static inline +#ifdef HB_USE_ATEXIT +static void free_static_shapers (void) { if (unlikely (static_shapers != all_shapers)) free ((void *) static_shapers); } +#endif const hb_shaper_pair_t * _hb_shapers_get (void) _______________________________________________ HarfBuzz mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/harfbuzz
