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/gpu | |
| 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/gpu')
| -rw-r--r-- | include/gpu/GrConfig.h | 4 | ||||
| -rw-r--r-- | include/gpu/gl/GrGLConfig.h | 2 | ||||
| -rw-r--r-- | include/gpu/vk/GrVkDefines.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/gpu/GrConfig.h b/include/gpu/GrConfig.h index 6febd8ac00..e0349685ac 100644 --- a/include/gpu/GrConfig.h +++ b/include/gpu/GrConfig.h @@ -51,7 +51,7 @@ /////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#if defined(SK_BUILD_FOR_WIN32) +#if defined(SK_BUILD_FOR_WIN) // VC8 doesn't support stdint.h, so we define those types here. typedef signed char int8_t; typedef unsigned char uint8_t; @@ -116,7 +116,7 @@ typedef unsigned __int64 uint64_t; * GR_ALWAYSBREAK is an unconditional break in all builds. */ #if !defined(GR_ALWAYSBREAK) - #if defined(SK_BUILD_FOR_WIN32) + #if defined(SK_BUILD_FOR_WIN) #define GR_ALWAYSBREAK SkNO_RETURN_HINT(); __debugbreak() #else // TODO: do other platforms really not have continuable breakpoints? diff --git a/include/gpu/gl/GrGLConfig.h b/include/gpu/gl/GrGLConfig.h index 20ee37fe30..1526f06e6b 100644 --- a/include/gpu/gl/GrGLConfig.h +++ b/include/gpu/gl/GrGLConfig.h @@ -21,7 +21,7 @@ #endif #if !defined(GR_GL_FUNCTION_TYPE) - #if defined(SK_BUILD_FOR_WIN32) + #if defined(SK_BUILD_FOR_WIN) #define GR_GL_FUNCTION_TYPE __stdcall #else #define GR_GL_FUNCTION_TYPE diff --git a/include/gpu/vk/GrVkDefines.h b/include/gpu/vk/GrVkDefines.h index be269e6b46..8f697c02b4 100644 --- a/include/gpu/vk/GrVkDefines.h +++ b/include/gpu/vk/GrVkDefines.h @@ -17,7 +17,7 @@ // This is deprecated and all clients should define their own custum header shim that sets up // defines and includes the vulkan.h header. Then they should define SK_VULKAN_HEADER or set the // skia_vulkan_header in gn to point to their custom header. -# if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_WIN32) +# if defined(SK_BUILD_FOR_WIN) # if !defined(VK_USE_PLATFORM_WIN32_KHR) # define VK_USE_PLATFORM_WIN32_KHR # endif |