From eb56f6ae96260c5b4bcd4e1dfb7ab733a230f3a8 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 7 Aug 2012 21:44:25 -0400
Subject: [PATCH] Minor

---
 src/hb-mutex-private.hh | 1 +
 src/hb-uniscribe.cc     | 1 +
 src/hb-uniscribe.h      | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/src/hb-mutex-private.hh b/src/hb-mutex-private.hh
index 8efd27efe..fc8ef4959 100644
--- a/src/hb-mutex-private.hh
+++ b/src/hb-mutex-private.hh
@@ -44,6 +44,7 @@
 
 #elif !defined(HB_NO_MT) && defined(_MSC_VER) || defined(__MINGW32__)
 
+#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-uniscribe.cc b/src/hb-uniscribe.cc
index 0ca87ecd7..79e62a050 100644
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
@@ -25,6 +25,7 @@
  */
 
 #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 bb99f3987..51887c879 100644
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
@@ -29,7 +29,9 @@
 
 #include "hb.h"
 
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
+#endif
 #include <windows.h>
 
 HB_BEGIN_DECLS