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

[Behdad Esfahbod]

 dev/null                            |binary
 src/hb-atomic-private.hh            |    3 +++
 test/shaping/fonts/sha1sum/MANIFEST |    1 -
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit f26d59d4684be3419c976d781b6dbc956248e3bb
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 19 16:10:21 2014 -0400

    More fixing MemoryBarrier() on Mingw32
    
    Set requested windows header to Vista.  See discussion:
    
    https://github.com/behdad/harfbuzz/commit/fbb2847f541389f40718af71c4945024ae177ab2#commitcomment-7054700

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index 60cbcf9..2336a9f 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -45,6 +45,9 @@
 #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
commit 00a57eb4b50fd894dc68c6525a5bbebf0ebc30e4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jul 18 14:42:50 2014 -0400

    [test] Remove unused micro-font

diff --git a/test/shaping/fonts/sha1sum/9d64156923a1b9fed1e05f74599c16563eca42d9.ttf b/test/shaping/fonts/sha1sum/9d64156923a1b9fed1e05f74599c16563eca42d9.ttf
deleted file mode 100644
index 7e5486f..0000000
Binary files a/test/shaping/fonts/sha1sum/9d64156923a1b9fed1e05f74599c16563eca42d9.ttf and /dev/null differ
diff --git a/test/shaping/fonts/sha1sum/MANIFEST b/test/shaping/fonts/sha1sum/MANIFEST
index d48b3f6..cd2ede5 100644
--- a/test/shaping/fonts/sha1sum/MANIFEST
+++ b/test/shaping/fonts/sha1sum/MANIFEST
@@ -3,7 +3,6 @@
 4cce528e99f600ed9c25a2b69e32eb94a03b4ae8.ttf
 813c2f8e5512187fd982417a7fb4286728e6f4a8.ttf
 8a9fea2a7384f2116e5b84a9b31f83be7850ce21.ttf
-9d64156923a1b9fed1e05f74599c16563eca42d9.ttf
 a919b33197965846f21074b24e30250d67277bce.ttf
 bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
 d629e7fedc0b350222d7987345fe61613fa3929a.ttf