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 --- src/xps/SkXPSDevice.cpp | 4 ++-- src/xps/SkXPSDocument.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/xps') diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 94c6b79c32..d0dd2ea49f 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -6,7 +6,7 @@ */ #include "SkTypes.h" -#if defined(SK_BUILD_FOR_WIN32) +#if defined(SK_BUILD_FOR_WIN) #include "SkLeanWindows.h" @@ -2233,4 +2233,4 @@ void SkXPSDevice::drawBitmapRect(const SkBitmap& bitmap, paintWithShader.setShader(std::move(bitmapShader)); this->drawRect(actualDst, paintWithShader); } -#endif//defined(SK_BUILD_FOR_WIN32) +#endif//defined(SK_BUILD_FOR_WIN) diff --git a/src/xps/SkXPSDocument.cpp b/src/xps/SkXPSDocument.cpp index 05bb280a1f..2665e90b63 100644 --- a/src/xps/SkXPSDocument.cpp +++ b/src/xps/SkXPSDocument.cpp @@ -7,7 +7,7 @@ #include "SkTypes.h" -#if defined(SK_BUILD_FOR_WIN32) +#if defined(SK_BUILD_FOR_WIN) #include "SkXPSDocument.h" #include "SkStream.h" @@ -64,4 +64,4 @@ sk_sp SkDocument::MakeXPS(SkWStream* stream, : nullptr; } -#endif//defined(SK_BUILD_FOR_WIN32) +#endif//defined(SK_BUILD_FOR_WIN) -- cgit v1.2.3