[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-atomic-private.hh |    4 +++-
 src/hb-mutex-private.hh  |    4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 022a05ae90f30bcddff413022e0cd801809b5390
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu May 17 21:53:24 2012 -0400

    Minor

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index 60b319a..a348f95 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -39,8 +39,10 @@
 
 /* We need external help for these */
 
+#if 0
 
-#if !defined(HB_NO_MT) && defined(_MSC_VER) && _MSC_VER >= 1600
+
+#elif !defined(HB_NO_MT) && defined(_MSC_VER) && _MSC_VER >= 1600
 
 #include <intrin.h>
 typedef long hb_atomic_int_t;
diff --git a/src/hb-mutex-private.hh b/src/hb-mutex-private.hh
index bdb438f..44b48df 100644
--- a/src/hb-mutex-private.hh
+++ b/src/hb-mutex-private.hh
@@ -39,8 +39,10 @@
 
 /* We need external help for these */
 
+#if 0
 
-#if !defined(HB_NO_MT) && defined(_MSC_VER) || defined(__MINGW32__)
+
+#elif !defined(HB_NO_MT) && defined(_MSC_VER) || defined(__MINGW32__)
 
 #include <windows.h>
 typedef CRITICAL_SECTION hb_mutex_impl_t;