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 /sd/source/helper | |
| 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 'sd/source/helper')
| -rw-r--r-- | sd/source/helper/simplereferencecomponent.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx index 4cf2ffcab08b..57c792ea5b0c 100644 --- a/sd/source/helper/simplereferencecomponent.cxx +++ b/sd/source/helper/simplereferencecomponent.cxx @@ -88,12 +88,12 @@ void * SimpleReferenceComponent::operator new(std::size_t nSize) void * SimpleReferenceComponent::operator new(std::size_t nSize, std::nothrow_t const & -#ifndef WNT +#ifndef _WIN32 rNothrow #endif ) { -#if defined WNT +#if defined(_WIN32) return ::operator new(nSize); // WNT lacks a global nothrow operator new... #else // WNT @@ -108,12 +108,12 @@ void SimpleReferenceComponent::operator delete(void * pPtr) void SimpleReferenceComponent::operator delete(void * pPtr, std::nothrow_t const & -#ifndef WNT +#ifndef _WIN32 rNothrow #endif ) { -#if defined WNT +#if defined(_WIN32) ::operator delete(pPtr); // WNT lacks a global nothrow operator delete... #else // WNT ::operator delete(pPtr, rNothrow); |