aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-09-30 15:10:27 +0000
committerYang Tse <yangsita@gmail.com>2008-09-30 15:10:27 +0000
commitaed98c5125014c4f3d5ae673384a110935bbc112 (patch)
tree14dbff9b8609e062bcffe5d2c54f0d6a2650bf84
parent2d77f7cd481d9bf395fdc0ce7dd7757bf3ad71f2 (diff)
fix compiler warning: declaration of 'err' shadows a previous local
-rw-r--r--lib/easy.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/easy.c b/lib/easy.c
index b8c13c6a6..04a219cbb 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -122,7 +122,7 @@ static CURLcode win32_init(void)
#ifdef USE_WINSOCK
WORD wVersionRequested;
WSADATA wsaData;
- int err;
+ int res;
#if defined(ENABLE_IPV6) && (USE_WINSOCK < 2)
Error IPV6_requires_winsock2
@@ -130,9 +130,9 @@ static CURLcode win32_init(void)
wVersionRequested = MAKEWORD(USE_WINSOCK, USE_WINSOCK);
- err = WSAStartup(wVersionRequested, &wsaData);
+ res = WSAStartup(wVersionRequested, &wsaData);
- if(err != 0)
+ if(res != 0)
/* Tell the user that we couldn't find a useable */
/* winsock.dll. */
return CURLE_FAILED_INIT;