[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fcwindows.h |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 342b908b9696a3f1cf1a45ddd779f3a17d6f9142
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 19 16:33:49 2014 -0400

    More mingw32 MemoryBarrier() fixup

diff --git a/src/fcwindows.h b/src/fcwindows.h
index 02489d9..a0eee67 100644
--- a/src/fcwindows.h
+++ b/src/fcwindows.h
@@ -32,8 +32,13 @@
 #endif
 
 #ifdef _WIN32
+   /* Request Windows Vista for building.  This is required to
+    * get MemoryBarrier on mingw32... */
+#  if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0600
+#    undef _WIN32_WINNT
+#  endif
 #  ifndef _WIN32_WINNT
-#    define _WIN32_WINNT 0x0500
+#    define _WIN32_WINNT 0x0600
 #  endif
 #  define WIN32_LEAN_AND_MEAN
 #  define WIN32_EXTRA_LEAN