From ce43d0ae9279edbf1ad108fe0d8325327a038d49 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 16 Feb 2016 11:26:51 +0200
Subject: 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>
---
 sd/source/ui/remotecontrol/BluetoothServer.cxx      | 2 +-
 sd/source/ui/remotecontrol/BufferedStreamSocket.cxx | 4 ++--
 sd/source/ui/remotecontrol/DiscoveryService.cxx     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'sd')

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
 
-- 
cgit