diff options
| author |  mtklein <mtklein@chromium.org> | 2015-01-13 13:27:25 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-13 13:27:26 -0800 |
| commit | e55fb177e9435daa7db88614fe181717002689fc (patch) | |
| tree | 6f8860275be0c3c6dc78162a93cc5de0b312bf4f /include/core/SkThreadPriv.h | |
| parent | 3c1096fc0740a1b572fdae6f879ac62d516ebc39 (diff) | |
Allow -DGOOGLE3 to bypass our normal platform intrinsic dispatch.
The current code that pound-includes another define doesn't seem to be working there.
BUG=skia:
No API changes.
TBR=reed@google.com
Review URL: https://codereview.chromium.org/820643005
Diffstat (limited to 'include/core/SkThreadPriv.h')
| -rw-r--r-- | include/core/SkThreadPriv.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/core/SkThreadPriv.h b/include/core/SkThreadPriv.h index c44cca5350..ab40731dc0 100644 --- a/include/core/SkThreadPriv.h +++ b/include/core/SkThreadPriv.h @@ -18,6 +18,10 @@ */ static void* sk_atomic_cas(void** addr, void* before, void* after); -#include SK_ATOMICS_PLATFORM_H +#ifdef GOOGLE3 + #include "SkAtomics_sync.h" +#else + #include SK_ATOMICS_PLATFORM_H +#endif #endif//SkThreadPriv_DEFINED |