Bug 910754 - Update SkUserConfig to cater for SkMutex/SkAtomics header locations r=snorp
authorGeorge Wright <george@mozilla.com>
Thu, 13 Feb 2014 02:07:10 -0500
changeset 169764 9604907f07d4b3133678107c31ba2440c37964f1
parent 169763 a35f514ea705b2d03e66895ad792cd44e248477e
child 169765 c3329f079d73903c8d1a9c5d0d00da03d1b9db7a
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewerssnorp
bugs910754
milestone30.0a1
Bug 910754 - Update SkUserConfig to cater for SkMutex/SkAtomics header locations r=snorp
gfx/skia/trunk/include/config/SkUserConfig.h
--- a/gfx/skia/trunk/include/config/SkUserConfig.h
+++ b/gfx/skia/trunk/include/config/SkUserConfig.h
@@ -183,10 +183,22 @@
 /* Skia uses these defines as the target of include preprocessor directives.
  * The header files pointed to by these defines provide declarations and
  * possibly inline implementations of threading primitives.
  *
  * See SkThread.h for documentation on what these includes must contain.
  */
 //#define SK_ATOMICS_PLATFORM_H "SkAtomics_xxx.h"
 //#define SK_MUTEX_PLATFORM_H "SkMutex_xxx.h"
+#  if defined(SK_BUILD_FOR_WIN32)
+#    define SK_ATOMICS_PLATFORM_H "skia/SkAtomics_win.h"
+#  elif defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+#    define SK_ATOMICS_PLATFORM_H "skia/SkAtomics_android.h"
+#  else
+#    define SK_ATOMICS_PLATFORM_H "skia/SkAtomics_sync.h"
+#  endif
 
+#  if defined(SK_BUILD_FOR_WIN32)
+#    define SK_MUTEX_PLATFORM_H "skia/SkMutex_win.h"
+#  else
+#    define SK_MUTEX_PLATFORM_H "skia/SkMutex_pthread.h"
+#  endif
 #endif