[HarfBuzz] harfbuzz: Branch 'master' - 3 commits

[Behdad Esfahbod]

 src/hb-atomic-private.hh |    4 ----
 src/hb-mutex-private.hh  |    1 -
 src/hb-private.hh        |   15 ++++++++++++++-
 src/hb-uniscribe.cc      |    3 ---
 src/hb-uniscribe.h       |    3 ---
 5 files changed, 14 insertions(+), 12 deletions(-)

New commits:
commit f1a8d50a87edfb8147aa1bec732ed7ccbfef2877
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 19 16:52:32 2014 -0400

    [win] Don't define visibility attribtue under Cygwin

diff --git a/src/hb-private.hh b/src/hb-private.hh
index f5bf6c6..68223b3 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -87,7 +87,7 @@
 #endif
 
 #ifndef HB_INTERNAL
-# ifndef __MINGW32__
+# if !defined(__MINGW32__) && !defined(__CYGWIN__)
 #  define HB_INTERNAL __attribute__((__visibility__("hidden")))
 # else
 #  define HB_INTERNAL
commit 9c77027d645142794c3ff1590a96bb151c3f2e91
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 19 16:37:22 2014 -0400

    [win] Turn STRICT on for including windows.h

diff --git a/src/hb-private.hh b/src/hb-private.hh
index 783e73c..f5bf6c6 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -127,6 +127,7 @@
 #    define _WIN32_WINNT 0x0600
 #  endif
 #  define WIN32_LEAN_AND_MEAN
+#  define STRICT
 #endif
 
 
commit db308280488c2ee11ba865a9922eb6a0c1abeef3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 19 16:32:04 2014 -0400

    [win] Consolidate windows.h include tips and tricks

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index 2336a9f..e6738b7 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -44,10 +44,6 @@
 
 #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__))
 
-#define WIN32_LEAN_AND_MEAN
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
-#endif
 #include <windows.h>
 
 /* MinGW has a convoluted history of supporting MemoryBarrier
diff --git a/src/hb-mutex-private.hh b/src/hb-mutex-private.hh
index 0fb21c2..eaa2169 100644
--- a/src/hb-mutex-private.hh
+++ b/src/hb-mutex-private.hh
@@ -44,7 +44,6 @@
 
 #elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__))
 
-#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 typedef CRITICAL_SECTION hb_mutex_impl_t;
 #define HB_MUTEX_IMPL_INIT	{ NULL, 0, 0, NULL, NULL, 0 }
diff --git a/src/hb-private.hh b/src/hb-private.hh
index a451d16..783e73c 100644
--- a/src/hb-private.hh
+++ b/src/hb-private.hh
@@ -116,6 +116,18 @@
 #define HB_FUNC __func__
 #endif
 
+#ifdef _WIN32
+   /* We need Windows Vista for both Uniscribe backend and for
+    * MemoryBarrier.  We don't support compiling on Windows XP,
+    * though we run on it fine. */
+#  if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
+#    undef _WIN32_WINNT
+#  endif
+#  ifndef _WIN32_WINNT
+#    define _WIN32_WINNT 0x0600
+#  endif
+#  define WIN32_LEAN_AND_MEAN
+#endif
 
 
 /* Basics */
diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc
index 6bdf0f5..1594948 100644
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
@@ -24,9 +24,6 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#define _WIN32_WINNT 0x0600
-#define WIN32_LEAN_AND_MEAN
-
 #define HB_SHAPER uniscribe
 #include "hb-shaper-impl-private.hh"
 
diff --git a/src/hb-uniscribe.h b/src/hb-uniscribe.h
index 51887c8..001ab38 100644
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
@@ -29,9 +29,6 @@
 
 #include "hb.h"
 
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0600
-#endif
 #include <windows.h>
 
 HB_BEGIN_DECLS