From 62e2899de17bfac5d8feada51e9befb0ffb9774c Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 15 Jun 2010 16:56:42 +0200
Subject: [PATCH] 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>
---
 ChangeLog      | 6 ++++++
 m4/sockpfaf.m4 | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 48b37aaf2..8fe5099b7 100644
--- 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 8a0c23603..8806705ae 100644
--- 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;]])],
-- 
2.11.0