From: Ali Abdulkadir <autostart.ini@gmail.com>
Date: Sun, 5 Nov 2017 22:42:13 +0000 (+0300)
Subject: improved check for ipv6 support on windows (autotools)
X-Git-Tag: tcpdump-4.99-bp~1787^2
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/9b939ac5a38713742ed8fdc5a44bbd11ee6b676b

improved check for ipv6 support on windows (autotools)
---

diff --git a/configure b/configure
index 60a07869..acf2d14c 100755
--- a/configure
+++ b/configure
@@ -4738,8 +4738,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 /* AF_INET6 available check */
 #include <sys/types.h>
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else
 #include <sys/socket.h>
 #include <netinet/in.h>
+#endif
 #ifdef AF_INET6
 void
 foo(struct in6_addr *addr)
diff --git a/configure.in b/configure.in
index c24cd46e..f484c353 100644
--- a/configure.in
+++ b/configure.in
@@ -258,8 +258,12 @@ AC_COMPILE_IFELSE(
 	[[
 /* AF_INET6 available check */
 #include <sys/types.h>
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else
 #include <sys/socket.h>
 #include <netinet/in.h>
+#endif
 #ifdef AF_INET6
 void
 foo(struct in6_addr *addr)
diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index a0c3fc21..b214be5f 100644
--- a/netdissect-stdinc.h
+++ b/netdissect-stdinc.h
@@ -220,7 +220,7 @@
 #define inline __inline
 #endif
 
-#ifdef AF_INET6
+#if defined(AF_INET6) && !defined(HAVE_OS_IPV6_SUPPORT)
 #define HAVE_OS_IPV6_SUPPORT
 #endif