[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-private.hh |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 270971a0fccdf4964fd3e8ab8e5cf53037a3518d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Aug 15 14:28:04 2014 -0400

    [win32] Avoid preprocessor warnings re macros

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 80fd6c4..d9b0860 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -128,8 +128,12 @@
 #  ifndef _WIN32_WINNT
 #    define _WIN32_WINNT 0x0600
 #  endif
-#  define WIN32_LEAN_AND_MEAN
-#  define STRICT
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN 1
+#  endif
+#  ifndef STRICT
+#    define STRICT 1
+#  endif
 #endif
 
 #ifdef _WIN32_WCE