[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-atomic-private.hh |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 391f1ff5d894b60bfe0f606be436ffe7e43f7455
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jul 13 09:04:07 2012 -0400

    Fix _InterlockedCompareExchangePointer on x86

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index 918852d..a833a6c 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -45,7 +45,13 @@
 #elif !defined(HB_NO_MT) && defined(_MSC_VER) && _MSC_VER >= 1600
 
 #include <intrin.h>
+/* On x86, _InterlockedCompareExchangePointer is a macro defined in concrt.h */
+#if defined(_M_IX86)
+#include <concrt.h>
+#pragma intrinsic(_InterlockedExchangeAdd)
+#else
 #pragma intrinsic(_InterlockedExchangeAdd, _InterlockedCompareExchangePointer)
+#endif
 
 typedef long hb_atomic_int_t;
 #define hb_atomic_int_add(AI, V)	_InterlockedExchangeAdd (&(AI), (V))