From: Jim Meyering <jim@meyering.net>
Date: Wed, 5 Oct 2005 09:09:33 +0000 (+0000)
Subject: Merge from gnulib.
X-Git-Tag: v5.91~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3b816532837067e035ddca8b861652e9c0610f3;p=thirdparty%2Fcoreutils.git

Merge from gnulib.
---

diff --git a/lib/getaddrinfo.h b/lib/getaddrinfo.h
index 087d3d5793..54c9198bbb 100644
--- 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