diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-03-01 14:01:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-03-01 17:40:47 +0100 |
| commit | e1e39fac2203d10f8a19b18558c42a1943ad8736 (patch) | |
| tree | 6cd968d66a1bd697eb8856950f4a3f3c77b9e390 /external/redland | |
| parent | c2b20809b5d446d8f9d1d35723d67d24f64144dd (diff) | |
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 <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/redland')
| -rw-r--r-- | external/redland/raptor/raptor2.h | 2 | ||||
| -rw-r--r-- | external/redland/rasqal/rasqal-msvc.patch.1 | 4 | ||||
| -rw-r--r-- | external/redland/rasqal/rasqal.h | 2 | ||||
| -rw-r--r-- | external/redland/redland/librdf.h | 4 |
4 files changed, 6 insertions, 6 deletions
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 |