[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-common.cc |    2 +-
 src/hb-ft.cc     |    2 +-
 src/hb-shape.cc  |    2 +-
 src/hb-shaper.cc |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit e9171af55cc6a402eb20db4ea74c86a0b1e70e85
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jan 29 22:45:00 2013 -0500

    Bug 60053 - hb-common.cc:181:6: warning: ‘void free_langs()’ defined but not used

diff --git a/src/hb-common.cc b/src/hb-common.cc
index 9422555..27ecfa7 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -177,7 +177,7 @@ struct hb_language_item_t {
 
 static hb_language_item_t *langs;
 
-static
+static inline
 void free_langs (void)
 {
   while (langs) {
diff --git a/src/hb-ft.cc b/src/hb-ft.cc
index 6198185..1e87c1c 100644
--- a/src/hb-ft.cc
+++ b/src/hb-ft.cc
@@ -403,7 +403,7 @@ hb_ft_font_create (FT_Face           ft_face,
 
 static FT_Library ft_library;
 
-static
+static inline
 void free_ft_library (void)
 {
   FT_Done_FreeType (ft_library);
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 389ce3e..7ae56e3 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -202,7 +202,7 @@ hb_feature_to_string (hb_feature_t *feature,
 
 static const char **static_shaper_list;
 
-static
+static inline
 void free_static_shaper_list (void)
 {
   free (static_shaper_list);
diff --git a/src/hb-shaper.cc b/src/hb-shaper.cc
index 1c1aed9..44f718a 100644
--- a/src/hb-shaper.cc
+++ b/src/hb-shaper.cc
@@ -40,7 +40,7 @@ static const hb_shaper_pair_t all_shapers[] = {
 
 static const hb_shaper_pair_t *static_shapers;
 
-static
+static inline
 void free_static_shapers (void)
 {
   if (unlikely (static_shapers != all_shapers))