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 /include/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 'include/core')
| -rw-r--r-- | include/core/SkPostConfig.h | 6 | ||||
| -rw-r--r-- | include/core/SkPreConfig.h | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index 61296e868d..ccf6e8a2ed 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -10,10 +10,6 @@ #ifndef SkPostConfig_DEFINED #define SkPostConfig_DEFINED -#if defined(SK_BUILD_FOR_WIN32) -# define SK_BUILD_FOR_WIN -#endif - #if !defined(SK_DEBUG) && !defined(SK_RELEASE) #ifdef NDEBUG #define SK_RELEASE @@ -207,7 +203,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////// -#if defined SK_DEBUG && defined SK_BUILD_FOR_WIN32 +#if defined SK_DEBUG && defined SK_BUILD_FOR_WIN # ifdef free # undef free # endif diff --git a/include/core/SkPreConfig.h b/include/core/SkPreConfig.h index 0e6f787aee..da91a17400 100644 --- a/include/core/SkPreConfig.h +++ b/include/core/SkPreConfig.h @@ -18,14 +18,14 @@ ////////////////////////////////////////////////////////////////////// -#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) +#if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_WIN) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) #ifdef __APPLE__ #include "TargetConditionals.h" #endif #if defined(_WIN32) || defined(__SYMBIAN32__) - #define SK_BUILD_FOR_WIN32 + #define SK_BUILD_FOR_WIN #elif defined(ANDROID) || defined(__ANDROID__) #define SK_BUILD_FOR_ANDROID #elif defined(linux) || defined(__linux) || defined(__FreeBSD__) || \ @@ -52,7 +52,7 @@ ////////////////////////////////////////////////////////////////////// -#ifdef SK_BUILD_FOR_WIN32 +#ifdef SK_BUILD_FOR_WIN #if !defined(SK_RESTRICT) #define SK_RESTRICT __restrict #endif |