From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 1 Oct 2005 11:19:16 +0000 (+0000)
Subject: 2005-10-01  Simon Josefsson  <jas@extundo.com>
X-Git-Tag: cvs-readonly~2865
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=eeb823a84268d8a8d9069c0b0349c9a011562e5a;p=gnulib.git

2005-10-01  Simon Josefsson  <jas@extundo.com>

	* getaddrinfo.m4: Include sys/types.h for sys/socket.h, on FreeBSD
	and Darwin.
---

diff --git a/m4/ChangeLog b/m4/ChangeLog
index d8b5e8704..41cee1be1 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-01  Simon Josefsson  <jas@extundo.com>
 
+	* getaddrinfo.m4: Include sys/types.h for sys/socket.h, on FreeBSD
+	and Darwin.
+
 	* getaddrinfo.m4: Use AC_GNU_SOURCE, GNU only declare getaddrinfo
 	as an (POSIX) extension.  Check for sys/types.h, sys/socket.h, and
 	netdb.h too, needed by getaddrinfo.h.  Check if getaddrinfo,
diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4
index f95bb1a93..be44232d7 100644
--- a/m4/getaddrinfo.m4
+++ b/m4/getaddrinfo.m4
@@ -21,6 +21,12 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_CHECK_HEADERS_ONCE(sys/socket.h netdb.h sys/types.h netinet/in.h)
   AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror],,,[
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
@@ -29,6 +35,9 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [
 #endif
 ])
   AC_CHECK_TYPES([struct addrinfo],,,[
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif