summaryrefslogtreecommitdiffstats
path: root/external/curl/curl-7.26.0_win-proxy.patch
diff options
context:
space:
mode:
Diffstat (limited to 'external/curl/curl-7.26.0_win-proxy.patch')
-rw-r--r--external/curl/curl-7.26.0_win-proxy.patch12
1 files changed, 6 insertions, 6 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) {