From: Yang Tse <yangsita@gmail.com>
Date: Fri, 19 Oct 2007 10:52:28 +0000 (+0000)
Subject: Avoid shadowing a global declaration
X-Git-Tag: curl-7_17_1~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a70a6d0c0d1a23dd6c3d286a8fe4359c179e835;p=thirdparty%2Fcurl.git

Avoid shadowing a global declaration
---

diff --git a/ares/ares.h b/ares/ares.h
index 03b6a924a6..4437e3d3ab 100644
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -158,17 +158,10 @@ typedef int ares_socket_t;
 #define ares_socket_typedef
 #endif /* ares_socket_typedef */
 
-#ifdef WIN32
-typedef void (*ares_sock_state_cb)(void *data,
-                                   SOCKET socket,
-                                   int readable,
-                                   int writable);
-#else
 typedef void (*ares_sock_state_cb)(void *data,
-                                   int socket,
+                                   ares_socket_t socket_fd,
                                    int readable,
                                    int writable);
-#endif
 
 struct apattern;