Some more WIN32 -> _WIN32

...at least some of which have presumably been missing from
ce43d0ae92 "use consistent #define checks for the
Windows platform" by accident (and some just clean up comments)

Change-Id: I5532685c7df96ae3c8a25b73d8064d7433964a9b
Reviewed-on: https://gerrit.libreoffice.org/68580
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

basic/qa/cppunit/test_vba.cxx

@@ -137,7 +137,7 @@ void VBATest::testMiscVBAFunctions()
         "weekday.vb",
         "weekdayname.vb",
         "year.vb",
-#ifndef WIN32 // missing 64bit Currency marshalling.
+#ifndef _WIN32 // missing 64bit Currency marshalling.
         "win32compat.vb", // windows compatibility hooks.
 #endif
         "win32compatb.vb" // same methods, different signatures.

basic/source/classes/sbxmod.cxx

@@ -1076,7 +1076,7 @@ void SbModule::Run( SbMethod* pMeth )
           // Empiric value, 1650 = needed bytes/Basic call level
           // for Solaris including 10% safety margin
           nMaxCallLevel = rl.rlim_cur / 1650;
-#elif defined WIN32
+#elif defined _WIN32
           nMaxCallLevel = 5800;
 #else
           nMaxCallLevel = MAXRECURSION;

basic/source/sbx/sbxdec.cxx

@@ -283,7 +283,7 @@ bool SbxDecimal::getDouble( double& rVal )
 }
 
 #else
-// !WIN32
+// !_WIN32
 
 bool SbxDecimal::operator -= ( const SbxDecimal & )
 {

external/curl/curl-7.26.0_win-proxy.patch

@@ -107,7 +107,7 @@
 +    GlobalFree(ieProxyConfig->lpszProxyBypass);
 +  }
 +  free(no_proxy);
-+#else /* !WIN32 */
++#else /* !_WIN32 */
    char proxy_env[128];
    const char *protop = conn->handler->scheme;
    char *envp = proxy_env;
@@ -115,7 +115,7 @@
    }
    if(proxy)
      infof(conn->data, "Uses proxy env variable %s == '%s'\n", envp, proxy);
-+#endif /* WIN32 */
++#endif /* _WIN32 */
  
    return proxy;
  }

external/neon/configs/config.h

@@ -183,7 +183,7 @@
 
 #ifndef DISABLE_OPENSSL
 /* Define if NTLM is supported */
-#ifndef WIN32
+#ifndef _WIN32
 #define HAVE_NTLM 1
 #endif
 
@@ -216,7 +216,7 @@
 #define HAVE_SETLOCALE 1
 
 /* Define to 1 if you have the `setsockopt' function. */
-#if defined (LINUX) || defined (WIN32)
+#if defined (LINUX) || defined (_WIN32)
 #define HAVE_SETSOCKOPT 1
 #endif
 

external/redland/raptor/raptor2.h

@@ -90,7 +90,7 @@ extern "C" {
  *
  */
 #ifndef RAPTOR_API
-#  ifdef WIN32
+#  ifdef _WIN32
 #    ifdef __GNUC__
 #      undef _declspec
 #      define _declspec(x) __declspec(x)

external/redland/rasqal/rasqal-msvc.patch.1

@@ -15,7 +15,7 @@ diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h
  #include <rasqal_config.h>
  #endif
  
-+#ifdef WIN32
++#ifdef _WIN32
 +#include <win32_rasqal_config.h>
 +#endif
 +
@@ -28,7 +28,7 @@ diff -ru rasqal.orig/src/win32_rasqal_config.h rasqal/src/win32_rasqal_config.h
  extern "C" {
  #endif
  
-+#ifdef WIN32
++#ifdef _WIN32
 +#include <win32_rasqal_config.h>
 +#else
  #include <rasqal_config.h>

external/redland/rasqal/rasqal.h

@@ -77,7 +77,7 @@ extern "C" {
  *
  */
 #ifndef RASQAL_API
-#  ifdef WIN32
+#  ifdef _WIN32
 #    ifdef __GNUC__
 #      undef _declspec
 #      define _declspec(x) __declspec(x)

external/redland/redland/librdf.h

@@ -44,7 +44,7 @@ extern "C" {
 #include <stdio.h>
 
 #ifndef REDLAND_API
-#  ifdef WIN32
+#  ifdef _WIN32
 #    ifdef __GNUC__
 #      undef _declspec
 #      define _declspec(x) __declspec(x)
@@ -64,7 +64,7 @@ extern "C" {
 #endif
 
 #ifndef REDLAND_CALLBACK_STDCALL
-#  if defined(WIN32) && defined(USE_STDCALL_CALLBACKS)
+#  if defined(_WIN32) && defined(USE_STDCALL_CALLBACKS)
 #    define REDLAND_CALLBACK_STDCALL _stdcall
 #  else
 #    define REDLAND_CALLBACK_STDCALL

hwpfilter/source/hwpeq.cxx

@@ -36,7 +36,7 @@ using namespace std;
 /* @Man: change the hwp formula to LaTeX */
 #ifdef _WIN32
 # define ENDL  "\r\n"
-#else /* !WIN32 */
+#else /* !_WIN32 */
 # define ENDL  "\n"
 #endif
 

include/sal/config.h

@@ -41,7 +41,7 @@
 
 #endif /* defined _MSC_VER */
 
-#endif /* defined WIN32 */
+#endif /* defined _WIN32 */
 
 #if defined(__sun) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \
     defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) || defined(ANDROID) || \

vcl/qa/cppunit/timer.cxx

@@ -56,7 +56,7 @@ public:
     TimerTest() : BootstrapFixture(true, false) {}
 
     void testIdle();
-#ifndef WIN32
+#ifndef _WIN32
     void testIdleMainloop();
 #endif
 #ifdef TEST_WATCHDOG
@@ -77,7 +77,7 @@ public:
 
     CPPUNIT_TEST_SUITE(TimerTest);
     CPPUNIT_TEST(testIdle);
-#ifndef WIN32
+#ifndef _WIN32
     CPPUNIT_TEST(testIdleMainloop);
 #endif
 #ifdef TEST_WATCHDOG
@@ -134,7 +134,7 @@ void TimerTest::testIdle()
     CPPUNIT_ASSERT_MESSAGE("idle triggered", bTriggered);
 }
 
-#ifndef WIN32
+#ifndef _WIN32
 // tdf#91727
 void TimerTest::testIdleMainloop()
 {