projects
/
platform
/
upstream
/
curl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
778b6a8
)
avoid duplicate typedefs, as this type is also defined in our public headers
author
Daniel Stenberg
<daniel@haxx.se>
Mon, 10 Apr 2006 13:14:14 +0000
(13:14 +0000)
committer
Daniel Stenberg
<daniel@haxx.se>
Mon, 10 Apr 2006 13:14:14 +0000
(13:14 +0000)
lib/setup.h
patch
|
blob
|
history
diff --git
a/lib/setup.h
b/lib/setup.h
index
fc64698
..
cad81fb
100644
(file)
--- 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"