summaryrefslogtreecommitdiff
path: root/salhelper
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-02-16 14:14:43 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-02-17 11:33:57 +0000
commit2087484c65a3d5e75a9e8ad116d11a4e13366219 (patch)
tree1f335918a854319df9269329d165a91d711d2108 /salhelper
parentd6bf086012343b4a1e27cd4242dced9ee0d73a06 (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 'salhelper')
-rw-r--r--salhelper/source/simplereferenceobject.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/salhelper/source/simplereferenceobject.cxx b/salhelper/source/simplereferenceobject.cxx
index 95e8b6f699d9..72e31c429cdc 100644
--- a/salhelper/source/simplereferenceobject.cxx
+++ b/salhelper/source/simplereferenceobject.cxx
@@ -37,7 +37,7 @@ void * SimpleReferenceObject::operator new(std::size_t nSize)
void * SimpleReferenceObject::operator new(std::size_t nSize,
std::nothrow_t const &)
{
-#if defined WNT
+#if defined(_WIN32)
return ::operator new(nSize);
// WNT lacks a global nothrow operator new...
#else // WNT
@@ -52,7 +52,7 @@ void SimpleReferenceObject::operator delete(void * pPtr)
void SimpleReferenceObject::operator delete(void * pPtr, std::nothrow_t const &)
{
-#if defined WNT
+#if defined(_WIN32)
::operator delete(pPtr); // WNT lacks a global nothrow operator delete...
#else // WNT
::operator delete(pPtr, std::nothrow);