[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-unicode.cc |    9 +++++++--
 src/hb-warning.cc |   11 -----------
 2 files changed, 7 insertions(+), 13 deletions(-)

New commits:
commit 09732cc6695b8e41ba6cdcd4058a4f7cad90167a
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Mar 19 12:00:17 2014 -0700

    Remove dead warning

diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index ed99ca2..84e5c06 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -146,8 +146,13 @@ hb_unicode_funcs_get_default (void)
 }
 
 #if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL)
-#pragma message("Could not find any Unicode functions implementation, you have to provide your own.")
-#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS.")
+#ifdef _MSC_VER
+#pragma message("Could not find any Unicode functions implementation, you have to provide your own")
+#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS")
+#else
+#warning "Could not find any Unicode functions implementation, you have to provide your own"
+#warning "To suppress this warning, define HB_NO_UNICODE_FUNCS"
+#endif
 #endif
 
 /**
diff --git a/src/hb-warning.cc b/src/hb-warning.cc
index 4f1f65f..e0f88e2 100644
--- a/src/hb-warning.cc
+++ b/src/hb-warning.cc
@@ -53,14 +53,3 @@
 #endif
 
 
-#include "hb-unicode-private.hh"
-
-#if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL)
-#ifdef _MSC_VER
-#pragma message("Could not find any Unicode functions implementation, you have to provide your own")
-#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS")
-#else
-#warning "Could not find any Unicode functions implementation, you have to provide your own"
-#warning "To suppress this warning, define HB_NO_UNICODE_FUNCS"
-#endif
-#endif