diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 11:26:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-16 10:37:55 +0000 |
| commit | ce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch) | |
| tree | a0fbf7bbd608d1185005a0de36496c6f3656e798 /sd | |
| parent | 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff) | |
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f
Reviewed-on: https://gerrit.libreoffice.org/22390
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/remotecontrol/BluetoothServer.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/remotecontrol/DiscoveryService.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index b29ce38d926b..f177d86509e5 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -29,7 +29,7 @@ #include "BufferedStreamSocket.hxx" #endif -#ifdef WIN32 +#ifdef _WIN32 // LO vs WinAPI conflict #undef WB_LEFT #undef WB_RIGHT diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index 3346c856f095..d628396df347 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -11,7 +11,7 @@ #include <algorithm> -#ifdef WIN32 +#ifdef _WIN32 // LO vs WinAPI conflict #undef WB_LEFT #undef WB_RIGHT @@ -70,7 +70,7 @@ void BufferedStreamSocket::close() { if( usingCSocket && mSocket != -1 ) { -#ifdef WIN32 +#ifdef _WIN32 ::closesocket( mSocket ); #else ::close( mSocket ); diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index 4fa31fbfe659..b545d8debc71 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -20,7 +20,7 @@ #include "DiscoveryService.hxx" -#ifdef WIN32 +#ifdef _WIN32 // LO vs WinAPI conflict #undef WB_LEFT #undef WB_RIGHT @@ -91,7 +91,7 @@ void DiscoveryService::setupSockets() zService = new AvahiNetworkService(hostname); #endif -#ifdef WIN32 +#ifdef _WIN32 zService = new WINNetworkService(); #endif |