From 8f11d4dcafef4447fa68ea0ab28a72589241e9fd Mon Sep 17 00:00:00 2001 From: Mike Klein Date: Wed, 24 Jan 2018 12:42:55 -0500 Subject: 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 --- dm/DM.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dm/DM.cpp') diff --git a/dm/DM.cpp b/dm/DM.cpp index 754f035708..8e22c7e2ec 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -56,7 +56,7 @@ extern void SkPDFImageDumpStats(); #include -#ifndef SK_BUILD_FOR_WIN32 +#ifndef SK_BUILD_FOR_WIN #include #endif @@ -212,7 +212,7 @@ static void find_culprit() { } } -#if defined(SK_BUILD_FOR_WIN32) +#if defined(SK_BUILD_FOR_WIN) static LONG WINAPI crash_handler(EXCEPTION_POINTERS* e) { static const struct { const char* name; @@ -339,7 +339,7 @@ static void gather_gold() { /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/ -#if defined(SK_BUILD_FOR_WIN32) +#if defined(SK_BUILD_FOR_WIN) static const char* kNewline = "\r\n"; #else static const char* kNewline = "\n"; -- cgit v1.2.3