diff options
| author | Noel Grandin <noel@peralex.com> | 2016-02-16 11:26:51 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-16 10:37:55 +0000 |
| commit | ce43d0ae9279edbf1ad108fe0d8325327a038d49 (patch) | |
| tree | a0fbf7bbd608d1185005a0de36496c6f3656e798 /external/neon | |
| parent | 049cf885c6e6c12ac9fa20bcb4ca1472de5b9115 (diff) | |
use consistent #define checks for the Windows platform
stage 1 of replacing usage of various checks for the windows platform
with the compiler-defined '_WIN32' macro
Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f
Reviewed-on: https://gerrit.libreoffice.org/22390
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external/neon')
| -rw-r--r-- | external/neon/configs/config.h | 8 | ||||
| -rw-r--r-- | external/neon/neon.patch | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/external/neon/configs/config.h b/external/neon/configs/config.h index 232ea3c6916d..996f74412af2 100644 --- a/external/neon/configs/config.h +++ b/external/neon/configs/config.h @@ -25,7 +25,7 @@ /* Define to 1 if you have the declaration of `h_errno', and to 0 if you don't. */ -#ifdef WIN32 +#ifdef _WIN32 #define HAVE_DECL_H_ERRNO 1 #endif @@ -239,7 +239,7 @@ #define HAVE_SNPRINTF 1 #endif -#ifdef WIN32 +#ifdef _WIN32 #if _MSC_VER >= 1900 // VS 2015 #define HAVE_SNPRINTF 1 #else @@ -274,7 +274,7 @@ #define HAVE_STRCASECMP 1 #endif -#ifdef WIN32 +#ifdef _WIN32 #define strcasecmp strcmpi #endif @@ -588,7 +588,7 @@ char *stpcpy(char *, const char *); #endif -#ifdef WIN32 +#ifdef _WIN32 #include <io.h> diff --git a/external/neon/neon.patch b/external/neon/neon.patch index de52043d3dc1..a88c7d22e2c4 100644 --- a/external/neon/neon.patch +++ b/external/neon/neon.patch @@ -366,7 +366,7 @@ #include <pthread.h> #endif -+#ifdef WIN32 ++#ifdef _WIN32 +#define X509_NAME WIN32_X509_NAME +#include <windows.h> +#include <wincrypt.h> @@ -380,7 +380,7 @@ X509_STORE_load_locations(store, NE_SSL_CA_BUNDLE, NULL); #else X509_STORE_set_default_paths(store); -+#ifdef WIN32 ++#ifdef _WIN32 + { + HCERTSTORE hStore; + PCCERT_CONTEXT pContext = NULL; |