basic/qa/cppunit/test_vba.cxx | 2 +-
basic/source/classes/sbxmod.cxx | 2 +-
basic/source/sbx/sbxdec.cxx | 2 +-
external/curl/curl-7.26.0_win-proxy.patch | 4 ++--
external/neon/configs/config.h | 4 ++--
external/redland/raptor/raptor2.h | 2 +-
external/redland/rasqal/rasqal-msvc.patch.1 | 4 ++--
external/redland/rasqal/rasqal.h | 2 +-
external/redland/redland/librdf.h | 4 ++--
hwpfilter/source/hwpeq.cxx | 2 +-
include/sal/config.h | 2 +-
vcl/qa/cppunit/timer.cxx | 6 +++---
12 files changed, 18 insertions(+), 18 deletions(-)
New commits:
commit e1e39fac2203d10f8a19b18558c42a1943ad8736
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Fri Mar 1 14:01:43 2019 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Fri Mar 1 17:40:47 2019 +0100
Some more WIN32 -> _WIN32
...at least some of which have presumably been missing from
ce43d0ae9279edbf1ad108fe0d8325327a038d49 "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 <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index 820464ee22bd..5466afc5a536 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/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.
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 30f234655abb..c7da7a7f6e21 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/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;
diff --git a/basic/source/sbx/sbxdec.cxx b/basic/source/sbx/sbxdec.cxx
index b1f9b0dd00c0..8ae493031c0c 100644
--- a/basic/source/sbx/sbxdec.cxx
+++ b/basic/source/sbx/sbxdec.cxx
@@ -283,7 +283,7 @@ bool SbxDecimal::getDouble( double& rVal )
}
#else
-// !WIN32
+// !_WIN32
bool SbxDecimal::operator -= ( const SbxDecimal & )
{
diff --git a/external/curl/curl-7.26.0_win-proxy.patch
b/external/curl/curl-7.26.0_win-proxy.patch
index 5361433a917b..852881570e36 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/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;
}
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h
index c1f138bdd0d4..6f90ac834a17 100644
--- a/external/neon/configs/config.h
+++ b/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
diff --git a/external/redland/raptor/raptor2.h
b/external/redland/raptor/raptor2.h
index 93be47e7f8c0..4929117e772e 100644
--- a/external/redland/raptor/raptor2.h
+++ b/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)
diff --git a/external/redland/rasqal/rasqal-msvc.patch.1
b/external/redland/rasqal/rasqal-msvc.patch.1
index ff4e5b5a725e..fbdaf32b25a7 100644
--- a/external/redland/rasqal/rasqal-msvc.patch.1
+++ b/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>
diff --git a/external/redland/rasqal/rasqal.h b/external/redland/rasqal/rasqal.h
index 903a5a67a735..e1804f1c6c32 100644
--- a/external/redland/rasqal/rasqal.h
+++ b/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)
diff --git a/external/redland/redland/librdf.h
b/external/redland/redland/librdf.h
index a5fa32ba36d8..44674c583f0c 100644
--- a/external/redland/redland/librdf.h
+++ b/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
diff --git a/hwpfilter/source/hwpeq.cxx b/hwpfilter/source/hwpeq.cxx
index ca42907abd3c..d3bd46207469 100644
--- a/hwpfilter/source/hwpeq.cxx
+++ b/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
diff --git a/include/sal/config.h b/include/sal/config.h
index 18303909ad6c..c7e304a8c5d7 100644
--- a/include/sal/config.h
+++ b/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)
|| \
diff --git a/vcl/qa/cppunit/timer.cxx b/vcl/qa/cppunit/timer.cxx
index cb5a3bd64c52..01eef078fae8 100644
--- a/vcl/qa/cppunit/timer.cxx
+++ b/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()
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
