From db308280488c2ee11ba865a9922eb6a0c1abeef3 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Sat, 19 Jul 2014 16:32:04 -0400
Subject: [PATCH] [win] Consolidate windows.h include tips and tricks

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

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index 2336a9fcb19..e6738b7d9f6 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 0fb21c2e86e..eaa21695082 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 a451d164f91..783e73cbad3 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 6bdf0f5c7fa..1594948d60f 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 51887c8794b..001ab38ea87 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