Merge from gnulib.

diff --git a/lib/getaddrinfo.h b/lib/getaddrinfo.h
index 087d3d5793b53b47e1ddd8ab33f38a37dd2c7ac6..54c9198bbb7f7e71ff231bc177c9c0fbf7839425 100644 (file)
--- a/lib/getaddrinfo.h
+++ b/lib/getaddrinfo.h
@@ -19,19 +19,14 @@
 #ifndef GETADDRINFO_H
 # 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
-# ifdef HAVE_NETDB_H
-#  include <netdb.h>
-# endif
+/* Get all getaddrinfo related declarations, if available.  */
+# include <sys/socket.h>
+# include <netdb.h>
 
 # ifndef HAVE_STRUCT_ADDRINFO