From: Yang Tse <yangsita@gmail.com>
Date: Tue, 30 Sep 2008 15:10:27 +0000 (+0000)
Subject: fix compiler warning: declaration of 'err' shadows a previous local
X-Git-Tag: curl-7_19_1~249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aed98c5125014c4f3d5ae673384a110935bbc112;p=thirdparty%2Fcurl.git

fix compiler warning: declaration of 'err' shadows a previous local
---

diff --git a/lib/easy.c b/lib/easy.c
index b8c13c6a64..04a219cbba 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;