fix compiler warning: declaration of 'err' shadows a previous local
authorYang Tse <yangsita@gmail.com>
Tue, 30 Sep 2008 15:10:27 +0000 (15:10 +0000)
committerYang Tse <yangsita@gmail.com>
Tue, 30 Sep 2008 15:10:27 +0000 (15:10 +0000)
lib/easy.c

index b8c13c6..04a219c 100644 (file)
@@ -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;