[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-glib.cc |    4 ++--
 src/hb-icu.cc  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 3a7e137a68ec8f723dc3afa89c918ca2df7ff6bf
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 3 17:23:40 2012 -0700

    Dn't use gint

diff --git a/src/hb-glib.cc b/src/hb-glib.cc
index fe2368a..7af92cc 100644
--- a/src/hb-glib.cc
+++ b/src/hb-glib.cc
@@ -255,7 +255,7 @@ hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 
   gchar utf8[12];
   gchar *normalized;
-  gint len;
+  int len;
   hb_bool_t ret;
 
   len = g_unichar_to_utf8 (a, utf8);
@@ -292,7 +292,7 @@ hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 
   gchar utf8[6];
   gchar *normalized;
-  gint len;
+  int len;
   hb_bool_t ret;
 
   len = g_unichar_to_utf8 (ab, utf8);
diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 4694e31..d7fd185 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -278,7 +278,7 @@ hb_icu_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED,
 					void               *user_data HB_UNUSED)
 {
   UChar utf16[2], normalized[2 * HB_UNICODE_MAX_DECOMPOSITION_LEN + 1];
-  gint len;
+  int len;
   int32_t utf32_len;
   hb_bool_t err;
   UErrorCode icu_err;