commit 9b939ac5a38713742ed8fdc5a44bbd11ee6b676b
author Ali Abdulkadir <autostart.ini@gmail.com> Mon Nov 06 01:42:13 2017 +0300
committer Ali Abdulkadir <autostart.ini@gmail.com> Mon Nov 06 01:42:13 2017 +0300
tree c19d7ffa8c25014abe370525a999856dfee81ab1
parent 1aadfaac094abee8bfa7e3d37fe352562d1eba3d

improved check for ipv6 support on windows (autotools)

configure

diff --git a/configure b/configure
index 60a0786..acf2d14 100755
--- a/configure
+++ b/configure
@@ -4738,8 +4738,12 @@
 
 /* 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)

configure.in

diff --git a/configure.in b/configure.in
index c24cd46..f484c35 100644
--- a/configure.in
+++ b/configure.in
@@ -258,8 +258,12 @@
 	[[
 /* 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)

netdissect-stdinc.h

diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index a0c3fc2..b214be5 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