From e3b594fc67bafc56c355525374c81a12d192e996 Mon Sep 17 00:00:00 2001 From: David Capello Date: Sun, 10 Nov 2013 12:36:26 -0300 Subject: [PATCH] Fix warnings using Win32 Unicode functions instead of ANSI functions in curl lib --- third_party/curl/lib/getenv.c | 2 +- third_party/curl/lib/strerror.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/curl/lib/getenv.c b/third_party/curl/lib/getenv.c index 36fbb7583..3e4f8fd77 100644 --- a/third_party/curl/lib/getenv.c +++ b/third_party/curl/lib/getenv.c @@ -46,7 +46,7 @@ char *GetEnv(const char *variable) char *temp = getenv(variable); env[0] = '\0'; if(temp != NULL) - ExpandEnvironmentStrings(temp, env, sizeof(env)); + ExpandEnvironmentStringsA(temp, env, sizeof(env)); return (env[0] != '\0')?strdup(env):NULL; #else char *env = getenv(variable); diff --git a/third_party/curl/lib/strerror.c b/third_party/curl/lib/strerror.c index 59f2df5f7..82851a05c 100644 --- a/third_party/curl/lib/strerror.c +++ b/third_party/curl/lib/strerror.c @@ -630,8 +630,8 @@ const char *Curl_strerror(struct connectdata *conn, int err) strncpy(buf, strerror(err), max); else { if(!get_winsock_error(err, buf, max) && - !FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, - LANG_NEUTRAL, buf, (DWORD)max, NULL)) + !FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, + LANG_NEUTRAL, buf, (DWORD)max, NULL)) snprintf(buf, max, "Unknown error %d (%#x)", err, err); } #endif