summaryrefslogtreecommitdiff
path: root/setup.h
diff options
context:
space:
mode:
authorGisle Vanem <gvanem@broadpark.no>2005-11-09 21:38:58 +0000
committerGisle Vanem <gvanem@broadpark.no>2005-11-09 21:38:58 +0000
commit14199ea4b979e71525123addb5d941af03a74fcb (patch)
tree579a4eb3ca1f7d18c9980f37db1a4b4a1cacbcca /setup.h
parenta8e801a4d982fe4605eee48b5d46c4f7bd2ce4d3 (diff)
downloadc-ares-14199ea4b979e71525123addb5d941af03a74fcb.tar.gz
c-ares-14199ea4b979e71525123addb5d941af03a74fcb.tar.bz2
c-ares-14199ea4b979e71525123addb5d941af03a74fcb.zip
MSVC fix for 'socklen_t'. Replace <winsock.h> with <winsock2.h> +
<ws2tcpip.h> since IPv6 is no longer optional (was it ever?)
Diffstat (limited to 'setup.h')
-rw-r--r--setup.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/setup.h b/setup.h
index 619a285..d6e0378 100644
--- a/setup.h
+++ b/setup.h
@@ -19,8 +19,10 @@
#else
/* simple work-around for now, for systems without configure support */
#define ssize_t int
+#ifndef _MSC_VER
#define socklen_t int
#endif
+#endif
/* Recent autoconf versions define these symbols in config.h. We don't want
them (since they collide with the libcurl ones when we build
@@ -35,7 +37,8 @@
/* now typedef our socket type */
#if defined(WIN32) && !defined(WATT32)
-#include <winsock.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
typedef SOCKET ares_socket_t;
#define ARES_SOCKET_BAD INVALID_SOCKET
#else