[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-atomic-private.hh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49e72634af74a9fbad01f42f48e104218413acc0
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Dec 10 17:44:19 2015 +0100

    Limit use of AIX intrinsics to IBM's compiler

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index b49f808..100ba53 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -119,7 +119,7 @@ typedef unsigned int hb_atomic_int_impl_t;
 #define hb_atomic_ptr_impl_cmpexch(P,O,N)	( ({__machine_rw_barrier ();}), atomic_cas_ptr ((void **) (P), (void *) (O), (void *) (N)) == (void *) (O) ? true : false)
 
 
-#elif !defined(HB_NO_MT) && defined(_AIX)
+#elif !defined(HB_NO_MT) && defined(_AIX) && defined(__IBMCPP__)
 
 #include <builtins.h>