diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-01-24 12:42:55 -0500 |
|---|---|---|
| committer | Mike Klein <mtklein@chromium.org> | 2018-01-26 19:52:04 +0000 |
| commit | 8f11d4dcafef4447fa68ea0ab28a72589241e9fd (patch) | |
| tree | 0061f498e823a56f25c394d711bdcb0043b1ef9f /src/core | |
| parent | 53d57ace9974f04ddde1fa2e3fb6e625ed5ee451 (diff) | |
eliminate SK_BUILD_FOR_WIN32
SK_BUILD_FOR_WIN and SK_BUILD_FOR_WIN32 have long meant the same thing.
Chrome fix is https://chromium-review.googlesource.com/c/chromium/src/+/884007
Change-Id: I0e907b1bcd2a358eabf776f414fd3aeb3c689561
Reviewed-on: https://skia-review.googlesource.com/99340
Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/SkCpu.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkExecutor.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkMathPriv.h | 2 | ||||
| -rw-r--r-- | src/core/SkSemaphore.cpp | 2 | ||||
| -rw-r--r-- | src/core/SkTime.cpp | 6 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/core/SkCpu.cpp b/src/core/SkCpu.cpp index 0107789bfb..e9777c0b3b 100644 --- a/src/core/SkCpu.cpp +++ b/src/core/SkCpu.cpp @@ -13,7 +13,7 @@ #endif #if defined(SK_CPU_X86) - #if defined(SK_BUILD_FOR_WIN32) + #if defined(SK_BUILD_FOR_WIN) #include <intrin.h> static void cpuid (uint32_t abcd[4]) { __cpuid ((int*)abcd, 1); } static void cpuid7(uint32_t abcd[4]) { __cpuidex((int*)abcd, 7, 0); } diff --git a/src/core/SkExecutor.cpp b/src/core/SkExecutor.cpp index eb0412a55e..5e3d38c0d4 100644 --- a/src/core/SkExecutor.cpp +++ b/src/core/SkExecutor.cpp @@ -14,7 +14,7 @@ #include <deque> #include <thread> -#if defined(SK_BUILD_FOR_WIN32) +#if defined(SK_BUILD_FOR_WIN) #include <windows.h> static int num_cores() { SYSTEM_INFO sysinfo; diff --git a/src/core/SkMathPriv.h b/src/core/SkMathPriv.h index dcdd81fd41..30c5912a96 100644 --- a/src/core/SkMathPriv.h +++ b/src/core/SkMathPriv.h @@ -111,7 +111,7 @@ static inline float SkPinToUnitFloat(float x) { int SkCLZ_portable(uint32_t); #ifndef SkCLZ - #if defined(SK_BUILD_FOR_WIN32) + #if defined(SK_BUILD_FOR_WIN) #include <intrin.h> static inline int SkCLZ(uint32_t mask) { diff --git a/src/core/SkSemaphore.cpp b/src/core/SkSemaphore.cpp index 6ad10c4317..6dcb4f9c22 100644 --- a/src/core/SkSemaphore.cpp +++ b/src/core/SkSemaphore.cpp @@ -40,7 +40,7 @@ AnnotateHappensAfter(__FILE__, __LINE__, &fSemaphore); } }; -#elif defined(SK_BUILD_FOR_WIN32) +#elif defined(SK_BUILD_FOR_WIN) struct SkBaseSemaphore::OSSemaphore { HANDLE fSemaphore; diff --git a/src/core/SkTime.cpp b/src/core/SkTime.cpp index ca67f4c8a7..7988925bb3 100644 --- a/src/core/SkTime.cpp +++ b/src/core/SkTime.cpp @@ -26,7 +26,7 @@ void SkTime::DateTime::toISO8601(SkString* dst) const { } } -#ifdef SK_BUILD_FOR_WIN32 +#ifdef SK_BUILD_FOR_WIN void SkTime::GetDateTime(DateTime* dt) { if (dt) { @@ -43,7 +43,7 @@ void SkTime::GetDateTime(DateTime* dt) { } } -#else // SK_BUILD_FOR_WIN32 +#else // SK_BUILD_FOR_WIN #include <time.h> void SkTime::GetDateTime(DateTime* dt) { @@ -62,7 +62,7 @@ void SkTime::GetDateTime(DateTime* dt) { dt->fSecond = SkToU8(tstruct.tm_sec); } } -#endif // SK_BUILD_FOR_WIN32 +#endif // SK_BUILD_FOR_WIN #if !defined(__has_feature) #define __has_feature(x) 0 |