[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-icu.cc |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 4ac4c6f2e12ddc8bf5e750671321458218b6e0c8
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 13 10:52:52 2012 -0400

    Fix ICU build with older ICUs

diff --git a/src/hb-icu.cc b/src/hb-icu.cc
index 4bb7af2..e9b8abc 100644
--- a/src/hb-icu.cc
+++ b/src/hb-icu.cc
@@ -33,11 +33,16 @@
 
 #include "hb-unicode-private.hh"
 
-#include <unicode/uvernum.h>
 #include <unicode/uchar.h>
 #include <unicode/unorm.h>
 #include <unicode/ustring.h>
 
+#include <unicode/uversion.h>
+#ifndef U_ICU_VERSION_MAJOR_NUM
+/* I wish ICU had stronger stability guarantees.  Oh well... */
+#include <unicode/uvernum.h>
+#endif
+
 
 
 hb_script_t