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>

8 files changed, 10 insertions, 10 deletions

diff --git a/tools/OverwriteLine.h b/tools/OverwriteLine.h
index e8f0504b1a..8985a6a01c 100644
--- a/tools/OverwriteLine.h
+++ b/tools/OverwriteLine.h
@@ -3,7 +3,7 @@
 
 // Print this string to reset and clear your current terminal line.
 static const char* kSkOverwriteLine =
-#ifdef SK_BUILD_FOR_WIN32
+#ifdef SK_BUILD_FOR_WIN
 "\r                                                                               \r"
 #elif defined(SK_BUILD_FOR_IOS)
 "\r"
diff --git a/tools/ProcStats.cpp b/tools/ProcStats.cpp
index 51ddf55aa5..9515368f9e 100644
--- a/tools/ProcStats.cpp
+++ b/tools/ProcStats.cpp
@@ -19,7 +19,7 @@
         return static_cast<int>(ru.ru_maxrss / 1024);  // Linux reports kilobytes.
     #endif
     }
-#elif defined(SK_BUILD_FOR_WIN32)
+#elif defined(SK_BUILD_FOR_WIN)
     #include <windows.h>
     #include <psapi.h>
     int sk_tools::getMaxResidentSetSizeMB() {
@@ -59,7 +59,7 @@
         return rssPages * pageSize / 1024 / 1024;
     }
 
-#elif defined(SK_BUILD_FOR_WIN32)
+#elif defined(SK_BUILD_FOR_WIN)
     int sk_tools::getCurrResidentSetSizeMB() {
         PROCESS_MEMORY_COUNTERS info;
         GetProcessMemoryInfo(GetCurrentProcess(), &info, sizeof(info));
diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp
index c6cceb4843..3692606247 100644
--- a/tools/gpu/GrContextFactory.cpp
+++ b/tools/gpu/GrContextFactory.cpp
@@ -25,7 +25,7 @@
 #include "mock/MockTestContext.h"
 #include "GrCaps.h"
 
-#if defined(SK_BUILD_FOR_WIN32) && defined(SK_ENABLE_DISCRETE_GPU)
+#if defined(SK_BUILD_FOR_WIN) && defined(SK_ENABLE_DISCRETE_GPU)
 extern "C" {
     // NVIDIA documents that the presence and value of this symbol programmatically enable the high
     // performance GPU in laptops with switchable graphics.
diff --git a/tools/gpu/vk/GrVulkanDefines.h b/tools/gpu/vk/GrVulkanDefines.h
index 192f1c5abc..2eb49208fa 100644
--- a/tools/gpu/vk/GrVulkanDefines.h
+++ b/tools/gpu/vk/GrVulkanDefines.h
@@ -8,7 +8,7 @@
 #ifndef GrVulkanDefines_DEFINED
 #define GrVulkanDefines_DEFINED
 
-#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
diff --git a/tools/sk_app/CommandSet.cpp b/tools/sk_app/CommandSet.cpp
index d0154d6e61..9684ef2624 100644
--- a/tools/sk_app/CommandSet.cpp
+++ b/tools/sk_app/CommandSet.cpp
@@ -78,7 +78,7 @@ void CommandSet::addCommand(Window::Key k, const char* keyName, const char* grou
     fCommands.push_back(Command(k, keyName, group, description, function));
 }
 
-#if defined(SK_BUILD_FOR_WIN32)
+#if defined(SK_BUILD_FOR_WIN)
     #define SK_strcasecmp   _stricmp
 #else
     #define SK_strcasecmp   strcasecmp
diff --git a/tools/skdiff/skdiff.h b/tools/skdiff/skdiff.h
index 6bdaadc28d..1d4e8ace2a 100644
--- a/tools/skdiff/skdiff.h
+++ b/tools/skdiff/skdiff.h
@@ -14,7 +14,7 @@
 #include "SkString.h"
 #include "../private/SkTDArray.h"
 
-#if defined(SK_BUILD_FOR_WIN32)
+#if defined(SK_BUILD_FOR_WIN)
     #define PATH_DIV_STR "\\"
     #define PATH_DIV_CHAR '\\'
 #else
diff --git a/tools/skdiff/skdiff_html.cpp b/tools/skdiff/skdiff_html.cpp
index 6f3c3b09e1..e0476bc005 100644
--- a/tools/skdiff/skdiff_html.cpp
+++ b/tools/skdiff/skdiff_html.cpp
@@ -245,7 +245,7 @@ void print_diff_page(const int matchCount,
     if (outputDir.size() > 0 && PATH_DIV_CHAR == outputDir[0]) {
         isPathAbsolute = true;
     }
-#ifdef SK_BUILD_FOR_WIN32
+#ifdef SK_BUILD_FOR_WIN
     // On Windows, absolute paths can also start with "x:", where x is any
     // drive letter.
     if (outputDir.size() > 1 && ':' == outputDir[1]) {
diff --git a/tools/win_dbghelp.h b/tools/win_dbghelp.h
index d334318ad4..226249f4e6 100644
--- a/tools/win_dbghelp.h
+++ b/tools/win_dbghelp.h
@@ -8,7 +8,7 @@
 #ifndef win_dbghelp_DEFINED
 #define win_dbghelp_DEFINED
 
-#ifdef SK_BUILD_FOR_WIN32
+#ifdef SK_BUILD_FOR_WIN
 
 #include <dbghelp.h>
 #include <shellapi.h>
@@ -30,6 +30,6 @@ void setUpDebuggingFromArgs(const char* vargs0);
 
 int GenerateDumpAndPrintCallstack(EXCEPTION_POINTERS* pExceptionPointers);
 
-#endif  // SK_BUILD_FOR_WIN32
+#endif  // SK_BUILD_FOR_WIN
 
 #endif  // win_dbghelp_DEFINED