From db4c33b4fb2ea457b4f0574e5c974f637d35c1ad Mon Sep 17 00:00:00 2001 From: Gisle Vanem <gvanem@broadpark.no> Date: Wed, 9 Nov 2005 21:38:58 +0000 Subject: [PATCH] MSVC fix for 'socklen_t'. Replace <winsock.h> with <winsock2.h> + <ws2tcpip.h> since IPv6 is no longer optional (was it ever?) --- ares/setup.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ares/setup.h b/ares/setup.h index 619a285d2b..d6e0378120 100644 --- a/ares/setup.h +++ b/ares/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 -- GitLab