diff options
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/helper/simplereferencecomponent.cxx | 8 | ||||
| -rw-r--r-- | sd/source/ui/animations/SlideTransitionPane.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/DiscoveryService.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews7.cxx | 2 |
5 files changed, 9 insertions, 9 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); diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index 1f3cb27c719b..9f1e6bb13bf9 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -274,7 +274,7 @@ struct lcl_EqualsSoundFileName : public ::std::unary_function< OUString, bool > { // note: formerly this was a case insensitive search for all // platforms. It seems more sensible to do this platform-dependent -#if defined( WNT ) +#if defined(_WIN32) return maStr.equalsIgnoreAsciiCase( rStr ); #else return maStr == rStr; diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index d628396df347..1c40a13d6454 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -58,7 +58,7 @@ sal_Int32 BufferedStreamSocket::write( const void* pBuffer, sal_uInt32 n ) else return ::send( mSocket, -#if defined WNT +#if defined(_WIN32) static_cast<char const *>(pBuffer), #else pBuffer, diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index b545d8debc71..2ad0062bbcd9 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -63,7 +63,7 @@ DiscoveryService::~DiscoveryService() { if (mSocket != -1) { -#ifdef WNT +#ifdef _WIN32 closesocket( mSocket ); #else close( mSocket ); @@ -137,7 +137,7 @@ void DiscoveryService::setupSockets() multicastRequest.imr_interface.s_addr = htonl(INADDR_ANY); rc = setsockopt( mSocket, IPPROTO_IP, IP_ADD_MEMBERSHIP, - #ifdef WNT + #ifdef _WIN32 (const char*) #endif &multicastRequest, sizeof(multicastRequest)); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index a4d336644a76..3ebd45fb3123 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1490,7 +1490,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem(SID_HIDE_LAST_LEVEL); } -#if defined WNT || defined UNX +#if defined(_WIN32) || defined UNX if( !mxScannerManager.is() ) { rSet.DisableItem( SID_TWAIN_SELECT ); |