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 --- tools/skdiff/skdiff.h | 2 +- tools/skdiff/skdiff_html.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/skdiff') 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]) { -- cgit v1.2.3