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

[Behdad Esfahbod]

 src/hb-atomic-private.hh |    5 -----
 src/hb-warning.cc        |   29 +++++------------------------
 2 files changed, 5 insertions(+), 29 deletions(-)

New commits:
commit fa2bd9fb63d83b657373764d4b657084d8327fc9
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Jul 14 12:15:54 2012 -0400

    Further simplify atomic ops on Visual Studio

diff --git a/src/hb-atomic-private.hh b/src/hb-atomic-private.hh
index a833a6c..0f70641 100644
--- a/src/hb-atomic-private.hh
+++ b/src/hb-atomic-private.hh
@@ -46,12 +46,7 @@
 
 #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))
commit 0a492357016bc9a614d2a726f2006c10af68ca58
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jul 13 13:20:49 2012 -0400

    Minor

diff --git a/src/hb-warning.cc b/src/hb-warning.cc
index 4f1f65f..8ff4d20 100644
--- a/src/hb-warning.cc
+++ b/src/hb-warning.cc
@@ -29,38 +29,19 @@
 
 
 #if defined(HB_ATOMIC_INT_NIL)
-#ifdef _MSC_VER
-#pragma message("Could not find any system to define atomic_int macros, library may NOT be thread-safe")
-#else
-#warning "Could not find any system to define atomic_int macros, library may NOT be thread-safe"
+#pragma message("Could not find any system to define atomic_int macros, library may NOT be thread-safe.")
 #endif
-#endif
-
 #if defined(HB_MUTEX_IMPL_NIL)
-#ifdef _MSC_VER
-#pragma message("Could not find any system to define mutex macros, library may NOT be thread-safe")
-#else
-#warning "Could not find any system to define mutex macros, library may NOT be thread-safe"
-#endif
+#pragma message("Could not find any system to define mutex macros, library may NOT be thread-safe.")
 #endif
-
 #if defined(HB_ATOMIC_INT_NIL) || defined(HB_MUTEX_IMPL_NIL)
-#ifdef _MSC_VER
-#pragma message("To suppress these warnings, define HB_NO_MT")
-#else
-#warning "To suppress these warnings, define HB_NO_MT"
-#endif
+#pragma message("To suppress these warnings, define HB_NO_MT.")
 #endif
 
 
 #include "hb-unicode-private.hh"
 
 #if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL)
-#ifdef _MSC_VER
-#pragma message("Could not find any Unicode functions implementation, you have to provide your own")
-#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS")
-#else
-#warning "Could not find any Unicode functions implementation, you have to provide your own"
-#warning "To suppress this warning, define HB_NO_UNICODE_FUNCS"
-#endif
+#pragma message("Could not find any Unicode functions implementation, you have to provide your own.")
+#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS.")
 #endif