From ce43d0ae9279edbf1ad108fe0d8325327a038d49 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 16 Feb 2016 11:26:51 +0200 Subject: 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 Reviewed-by: Michael Stahl --- external/curl/curl-7.26.0_win-proxy.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'external/curl') 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 +#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)); -- cgit