Index: include/core/SkThread.h |
diff --git a/include/core/SkThread.h b/include/core/SkThread.h |
index bcbc43754f69e986eaadfbb3195bfbbff8fef7a6..fffe787e71473029b86a2544b6d9397ebb8cc626 100644 |
--- a/include/core/SkThread.h |
+++ b/include/core/SkThread.h |
@@ -44,7 +44,11 @@ static void sk_membar_acquire__after_atomic_dec(); |
*/ |
static void sk_membar_acquire__after_atomic_conditional_inc(); |
-#include SK_ATOMICS_PLATFORM_H |
+#ifdef GOOGLE3 |
+ #include "SkAtomics_sync.h" |
+#else |
+ #include SK_ATOMICS_PLATFORM_H |
+#endif |
/** Atomically adds one to the int referenced by addr iff the referenced int was not 0 |
* and returns the previous value. |
@@ -78,7 +82,11 @@ template <typename T> T sk_acquire_load(T*); |
*/ |
template <typename T> void sk_release_store(T*, T); |
-#include SK_BARRIERS_PLATFORM_H |
+#ifdef GOOGLE3 |
+ #include "SkBarriers_x86.h" |
+#else |
+ #include SK_BARRIERS_PLATFORM_H |
+#endif |
/** SK_MUTEX_PLATFORM_H must provide the following (or equivalent) declarations. |
@@ -98,7 +106,11 @@ public: |
#define SK_DECLARE_STATIC_MUTEX(name) static SkBaseMutex name = ... |
*/ |
-#include SK_MUTEX_PLATFORM_H |
+#ifdef GOOGLE3 |
+ #include "SkMutex_pthread.h" |
+#else |
+ #include SK_MUTEX_PLATFORM_H |
+#endif |
class SkAutoMutexAcquire : SkNoncopyable { |