Merge pull request #76 from cpeterso/cpeterso/Wunused-function

Add #ifdef HB_USE_ATEXIT to fix -Wunused-function warnings
10 years ago · 8cb41cb950
parent 365c03fc2b fb85d618f5
commit 8cb41cb950
4 changed files with 10 additions and 4 deletions
--- 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) {
--- 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)
--- 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:
--- 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)