diff options
Diffstat (limited to 'external')
-rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 12 | ||||
-rw-r--r-- | external/curl/curl-msvc.patch.1 | 8 |
2 files changed, 6 insertions, 14 deletions
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 580479ae4aa2..54aa746106de 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -27,14 +27,14 @@ } +#ifdef WIN32 -+static char* wstrToCstr( LPWSTR wStr ) ++static char *wstrToCstr(LPWSTR wStr) +{ + int bufSize; -+ char* out = NULL; ++ char *out = NULL; + if(wStr != NULL) { + bufSize = WideCharToMultiByte( + CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL); -+ out = (char*)malloc(bufSize * sizeof(char)); ++ out = (char *)malloc(bufSize * sizeof(char)); + WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL); + } + return out; @@ -59,13 +59,13 @@ - char *no_proxy=NULL; +#ifdef WIN32 + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig; -+ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*) ++ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *) + malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG)); + if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) { + if(!ieProxyConfig->fAutoDetect) { + char *ieProxy; + char *ieNoProxy; -+ char* pos; ++ char *pos; + + ieProxy = wstrToCstr(ieProxyConfig->lpszProxy); + ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass); @@ -82,7 +82,7 @@ + + if(!check_noproxy(conn->host.name, no_proxy)) { + /* Look for the http proxy setting */ -+ char* tok; ++ char *tok; + char *saveptr; + + if(NULL != ieProxy) { diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 88ced0a75493..57a292bb69a3 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -11,14 +11,6 @@ MSVC: using SOLARINC and EXCFLAGS CFGSET = FALSE -@@ -632,7 +632,6 @@ - $(DIROBJ)\vtls.obj \ - $(DIROBJ)\openssl.obj \ - $(DIROBJ)\strdup.obj \ -- $(DIROBJ)\strequal.obj \ - $(DIROBJ)\strerror.obj \ - $(DIROBJ)\strtok.obj \ - $(DIROBJ)\strtoofft.obj \ @@ -620,11 +620,11 @@ debug-dll-ssl-dll\libcurl.res \ debug-dll-zlib-dll\libcurl.res \ |