curl/curl-7.26.0_win-proxy.patch | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)
New commits: commit adbe46bcbe03fbb8bad62dbb7969a861201f8d02 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Jan 21 17:57:54 2013 +0100 ...and some more curl code layout massaging Change-Id: Ifbd7dcc3fa8d18192d2ac2fc5faca1b0637c93c2 Reviewed-on: https://gerrit.libreoffice.org/1801 Tested-by: Petr Mladek <pmla...@suse.cz> Reviewed-by: Petr Mladek <pmla...@suse.cz> diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch index 78cee02..61badc7 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 + _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits