diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 14:14:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-02-17 11:33:57 +0000 |
| commit | 2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch) | |
| tree | 1f335918a854319df9269329d165a91d711d2108 /canvas | |
| parent | d6bf086012343b4a1e27cd4242dced9ee0d73a06 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'canvas')
| -rw-r--r-- | canvas/source/cairo/cairo_services.cxx | 2 | ||||
| -rw-r--r-- | canvas/source/tools/elapsedtime.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
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 <canvas/elapsedtime.hxx> -#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() { |