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 --- sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 2 +- sd/source/ui/remotecontrol/DiscoveryService.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sd/source/ui/remotecontrol') 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(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)); -- cgit