improved check for ipv6 support on windows (autotools)

diff --git a/configure b/configure
index 60a0786901cbf5cb423e84f51ca57cdd7038ab78..acf2d14c46c5c2d08d3e1c377d5abc7265fc6e33 100755 (executable)
--- a/configure
+++ b/configure
@@ -4738,8 +4738,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 
 /* AF_INET6 available check */
 #include <sys/types.h>
 
 /* AF_INET6 available check */
 #include <sys/types.h>

+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

+#endif

 #ifdef AF_INET6
 void
 foo(struct in6_addr *addr)
 #ifdef AF_INET6
 void
 foo(struct in6_addr *addr)

diff --git a/configure.in b/configure.in
index c24cd46ed7b2444d3d4254fe5e8ba1c5958a7ac7..f484c353f3adccb50fc6f482e221522a41fda133 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -258,8 +258,12 @@ AC_COMPILE_IFELSE(
        [[
 /* AF_INET6 available check */
 #include <sys/types.h>
        [[
 /* AF_INET6 available check */
 #include <sys/types.h>

+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else

 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

+#endif

 #ifdef AF_INET6
 void
 foo(struct in6_addr *addr)
 #ifdef AF_INET6
 void
 foo(struct in6_addr *addr)

diff --git a/netdissect-stdinc.h b/netdissect-stdinc.h
index a0c3fc21ada2fd1b8dcf8f98963f06f853088748..b214be5fba1a4f51e29aacab36d32330d7d5ccc7 100644 (file)
--- a/netdissect-stdinc.h
+++ b/netdissect-stdinc.h
@@ -220,7 +220,7 @@
 #define inline __inline
 #endif
 
 #define inline __inline
 #endif
 

-#ifdef AF_INET6
+#if defined(AF_INET6) && !defined(HAVE_OS_IPV6_SUPPORT)

 #define HAVE_OS_IPV6_SUPPORT
 #endif
 
 #define HAVE_OS_IPV6_SUPPORT
 #endif