From 2087484c65a3d5e75a9e8ad116d11a4e13366219 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
---
 basic/qa/cppunit/test_vba.cxx        | 2 +-
 basic/source/comp/parser.cxx         | 2 +-
 basic/source/runtime/dllmgr-none.cxx | 2 +-
 basic/source/runtime/dllmgr-x64.cxx  | 2 +-
 basic/source/runtime/dllmgr-x86.cxx  | 2 +-
 basic/source/runtime/methods.cxx     | 6 +++---
 basic/source/runtime/methods1.cxx    | 6 +++---
 basic/source/sbx/sbxdec.hxx          | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'basic')

diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 2b7ba5815863..b70d51096d37 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -81,7 +81,7 @@ void VBATest::testMiscVBAFunctions()
 void VBATest::testMiscOLEStuff()
 {
 // not much point even trying to run except on windows
-#if defined(WNT)
+#if defined(_WIN32)
     // test if we have the necessary runtime environment
     // to run the OLE tests.
     uno::Reference< lang::XMultiServiceFactory > xOLEFactory;
diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx
index 93825e1ead36..2048163c94a7 100644
--- a/basic/source/comp/parser.cxx
+++ b/basic/source/comp/parser.cxx
@@ -848,7 +848,7 @@ void SbiParser::AddConstants()
     addStringConst( aPublics, "vbCrLf", "\x0D\x0A" );
     addStringConst( aPublics, "vbFormFeed", "\x0C" );
     addStringConst( aPublics, "vbLf", "\x0A" );
-#ifndef WNT
+#ifndef _WIN32
     addStringConst( aPublics, "vbNewLine", "\x0D\x0A" );
 #else
     addStringConst( aPublics, "vbNewLine", "\x0A" );
diff --git a/basic/source/runtime/dllmgr-none.cxx b/basic/source/runtime/dllmgr-none.cxx
index 3d720bb54e62..8c0736463370 100644
--- a/basic/source/runtime/dllmgr-none.cxx
+++ b/basic/source/runtime/dllmgr-none.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#if defined(WNT)
+#if defined(_WIN32)
 #include <prewin.h>
 #include <postwin.h>
 #endif
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index 78fb890f9446..48e5cc736f89 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#if defined(WNT)
+#if defined(_WIN32)
 #include <prewin.h>
 #include <postwin.h>
 #endif
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 2c32b4aa0192..2bb299321c56 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#if defined(WNT)
+#if defined(_WIN32)
 #include <prewin.h>
 #include <postwin.h>
 #endif
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 6015cba739c6..85aca7da7476 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -88,7 +88,7 @@ using namespace com::sun::star::uno;
 #include "sbobjmod.hxx"
 #include "sbxmod.hxx"
 
-#ifdef WNT
+#ifdef _WIN32
 #include <prewin.h>
 #include <direct.h>
 #include <io.h>
@@ -392,7 +392,7 @@ RTLFUNC(CurDir)
     // there's no possibility to detect the current one in a way that a virtual URL
     // could be delivered.
 
-#if defined (WNT)
+#if defined(_WIN32)
     int nCurDir = 0;  // Current dir // JSM
     if ( rPar.Count() == 2 )
     {
@@ -3117,7 +3117,7 @@ RTLFUNC(GetAttr)
 
         // In Windows, we want to use Windows API to get the file attributes
         // for VBA interoperability.
-    #if defined( WNT )
+    #if defined(_WIN32)
         if( SbiRuntime::isVBAEnabled() )
         {
             OUString aPathURL = getFullPath( rPar.Get(1)->GetOUString() );
diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx
index f619b3722f6a..689aa0d10bf3 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -284,7 +284,7 @@ RTLFUNC(CDec)
     (void)pBasic;
     (void)bWrite;
 
-#ifdef WNT
+#ifdef _WIN32
     SbxDecimal* pDec = NULL;
     if ( rPar.Count() == 2 )
     {
@@ -525,9 +525,9 @@ RTLFUNC(GetGUIType)
     else
     {
         // 17.7.2000 Make simple solution for testtool / fat office
-#if defined (WNT)
+#if   defined(_WIN32)
         rPar.Get(0)->PutInteger( 1 );
-#elif defined UNX
+#elif defined(UNX)
         rPar.Get(0)->PutInteger( 4 );
 #else
         rPar.Get(0)->PutInteger( -1 );
diff --git a/basic/source/sbx/sbxdec.hxx b/basic/source/sbx/sbxdec.hxx
index eb71f2c9f50f..1c3461a219ee 100644
--- a/basic/source/sbx/sbxdec.hxx
+++ b/basic/source/sbx/sbxdec.hxx
@@ -21,7 +21,7 @@
 #ifndef INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
 #define INCLUDED_BASIC_SOURCE_SBX_SBXDEC_HXX
 
-#ifdef WNT
+#ifdef _WIN32
 #include <prewin.h>
 #include <postwin.h>
 
-- 
cgit