Merge from gnulib.

Include sys/types.h before other headers.

diff --git a/lib/getaddrinfo.h b/lib/getaddrinfo.h
index 8b2d9bcc103ebf49162c774913273d80d4efd623..087d3d5793b53b47e1ddd8ab33f38a37dd2c7ac6 100644 (file)
--- a/lib/getaddrinfo.h
+++ b/lib/getaddrinfo.h
@@ -20,6 +20,12 @@
 # define GETADDRINFO_H
 
 /* Get all getaddrinfo related declarations, if available.  */
+
+/* sys/socket.h in i386-unknown-freebsd4.10 and
+   powerpc-apple-darwin5.5 require sys/types.h, so include it first.
+   Then we'll also get 'socklen_t' and 'struct sockaddr' which are
+   used below. */
+# include <sys/types.h>
 # ifdef HAVE_SYS_SOCKET_H
 #  include <sys/socket.h>
 # endif
@@ -29,12 +35,6 @@
 
 # ifndef HAVE_STRUCT_ADDRINFO
 
-/* Get 'socklen_t', and 'struct sockaddr' via sys/types.h which are
-   used below. */
-#  ifdef HAVE_SYS_TYPES_H
-#   include <sys/types.h>
-#  endif
-
 /* Structure to contain information about address of a service provider.  */
 struct addrinfo
 {