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/curl | |
| 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/curl')
| -rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 99402a437e5a..81ccc65aab53 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -15,7 +15,7 @@ int curl_win32_idn_to_ascii(const char *in, char **out); #endif /* USE_LIBIDN */ -+#ifdef WIN32 ++#ifdef _WIN32 +#include <WinHttp.h> +#endif + @@ -26,7 +26,7 @@ return FALSE; } -+#ifdef WIN32 ++#ifdef _WIN32 +static char* wstrToCstr( LPWSTR wStr ) +{ + int bufSize; @@ -57,7 +57,7 @@ * checked if the lowercase versions don't exist. */ - char *no_proxy=NULL; -+#ifdef WIN32 ++#ifdef _WIN32 + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig; + ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*) + malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG)); |