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 --- salhelper/source/simplereferenceobject.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'salhelper') 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); -- cgit