diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-21 17:57:54 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-01-21 18:06:17 +0000 |
| commit | adbe46bcbe03fbb8bad62dbb7969a861201f8d02 (patch) | |
| tree | 761f35a62aa363efcc5316ab303b56f0052bed7d /curl | |
| parent | 02e3aae7dc88d1a4f992727c75aab13205f4c08e (diff) | |
...and some more curl code layout massaging
Change-Id: Ifbd7dcc3fa8d18192d2ac2fc5faca1b0637c93c2
Reviewed-on: https://gerrit.libreoffice.org/1801
Tested-by: Petr Mladek <pmladek@suse.cz>
Reviewed-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/curl-7.26.0_win-proxy.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch index 78cee0206685..61badc78feec 100644 --- a/curl/curl-7.26.0_win-proxy.patch +++ b/curl/curl-7.26.0_win-proxy.patch @@ -22,23 +22,22 @@ #include "urldata.h" #include "netrc.h" -@@ -4111,6 +4115,22 @@ static bool check_noproxy(const char* name, const char* no_proxy) +@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char* no_proxy) return FALSE; } +#ifdef WIN32 +static char* wstrToCstr( LPWSTR wStr ) +{ -+ int bufSize; -+ char* out = NULL; -+ if( wStr != NULL ) -+ { -+ bufSize = WideCharToMultiByte( -+ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL ); -+ out = ( char* )malloc( bufSize * sizeof(char)); -+ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL ); -+ } -+ return out; ++ int bufSize; ++ char* out = NULL; ++ if(wStr != NULL) { ++ bufSize = WideCharToMultiByte( ++ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL ); ++ out = ( char* )malloc( bufSize * sizeof(char)); ++ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL ); ++ } ++ return out; +} +#endif + |