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 186623 609d3ba60b5bdec91a56fbf8a5997b8c5c525584
parent 186622 29a97babd3957a798cd654acfa5f185c1524b096
child 186624 602341e2f084b7d5c6cc7548ef0ba7c01970676d
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssnorp
bugs910754
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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