ipv6: fix detection under mingw

this small patch fixes the detection of IPv6 under mingw.  The header
<ws2tcpip.h> is already used by <sys/socket.h>.

* m4/sockpfaf.m4 (gl_SOCKET_FAMILIES): Include <ws2tcpip.h> for struct
in6_addr.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 48b37aaf22e7a7733071e22a5d8835e8fcaf0f90..8fe5099b73bf8e8ae3c720e2c159a7992a9412ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-15  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       ipv6: fix detection under mingw
+       * m4/sockpfaf.m4 (gl_SOCKET_FAMILIES): Include <ws2tcpip.h> for struct
+       in6_addr.
+
 2010-06-14  Ben Pfaff  <blp@cs.stanford.edu>
 
        * m4/strtod.m4 (gl_FUNC_STRTOD): Factor out common code.  Assume

diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4
index 8a0c23603857399f96dd83bbf4f6e6564a8c7b43..8806705ae227ffb0272a0ee02265e5ea618e1b6e 100644 (file)
--- a/m4/sockpfaf.m4
+++ b/m4/sockpfaf.m4
@@ -47,6 +47,9 @@ AC_DEFUN([gl_SOCKET_FAMILIES],
 #endif
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
 #endif]],
 [[int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z;
  if (&x && &y && &z) return 0;]])],