From 2087484c65a3d5e75a9e8ad116d11a4e13366219 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Feb 2016 14:14:43 +0200 Subject: use consistent #define checks for the Windows platform stage 2 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro In this stage we focus on replacing usage of the WIN macro Change-Id: Ie8a4a63198a6de96bd158ecd707dadafb9c8ea84 Reviewed-on: https://gerrit.libreoffice.org/22393 Tested-by: Jenkins Reviewed-by: Noel Grandin --- canvas/source/cairo/cairo_services.cxx | 2 +- canvas/source/tools/elapsedtime.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'canvas') diff --git a/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx index 9cd28b11418e..10c0e31c7d37 100644 --- a/canvas/source/cairo/cairo_services.cxx +++ b/canvas/source/cairo/cairo_services.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; -#if defined(WNT) || defined (MACOSX) +#if defined(_WIN32) || defined (MACOSX) # error "The cairo canvas should not be enabled on Windows or Mac cf fdo#46901" #endif diff --git a/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx index d080c789a290..bde8032a1ce0 100644 --- a/canvas/source/tools/elapsedtime.cxx +++ b/canvas/source/tools/elapsedtime.cxx @@ -24,7 +24,7 @@ #include -#if defined(WNT) +#if defined(_WIN32) #if defined _MSC_VER #pragma warning(push,1) @@ -50,7 +50,7 @@ namespace canvas { namespace tools { -#if defined(WNT) +#if defined(_WIN32) // TODO(Q2): is 0 okay for the failure case here? double ElapsedTime::getSystemTime() { -- cgit