mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some more WIN32 -> _WIN32

Browse Source 
...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>
This commit is contained in:
Stephan Bergmann
2019-03-01 14:01:43 +01:00
parent c2b20809b5
commit e1e39fac22
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
basic/qa/cppunit/test_vba.cxx
View File

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

2
basic/source/classes/sbxmod.cxx
View File

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

2
basic/source/sbx/sbxdec.cxx
View File

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

4
external/curl/curl-7.26.0_win-proxy.patch vendored
View File

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

4
external/neon/configs/config.h vendored
View File

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

2
external/redland/raptor/raptor2.h vendored
View File

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

4
external/redland/rasqal/rasqal-msvc.patch.1 vendored
View File

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

2
external/redland/rasqal/rasqal.h vendored
View File

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

4
external/redland/redland/librdf.h vendored
View File

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

2
hwpfilter/source/hwpeq.cxx
View File

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

2
include/sal/config.h
View File

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

6
vcl/qa/cppunit/timer.cxx
View File

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