From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 10 Apr 2006 13:14:14 +0000 (+0000)
Subject: avoid duplicate typedefs, as this type is also defined in our public headers
X-Git-Tag: upstream/7.37.1~10429
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e6efecd0543c319e4d6192e23f7a7d2a26e8e114;p=platform%2Fupstream%2Fcurl.git

avoid duplicate typedefs, as this type is also defined in our public headers
---

diff --git a/lib/setup.h b/lib/setup.h
index fc64698..cad81fb 100644
--- a/lib/setup.h
+++ b/lib/setup.h
@@ -285,6 +285,7 @@ int fileno( FILE *stream);
 
 #endif /* WIN32 */
 
+#ifndef curl_socket_typedef
 /* now typedef our socket type */
 #ifdef WIN32
 typedef SOCKET curl_socket_t;
@@ -293,6 +294,9 @@ typedef SOCKET curl_socket_t;
 typedef int curl_socket_t;
 #define CURL_SOCKET_BAD -1
 #endif
+#define curl_socket_typedef
+#endif /* curl_socket_typedef */
+
 
 #if defined(ENABLE_IPV6) && defined(USE_ARES)
 #error "ares does not yet support IPv6. Disable IPv6 or ares and rebuild"