summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2005-10-05 09:09:33 +0000
committerJim Meyering <jim@meyering.net>2005-10-05 09:09:33 +0000
commitd3b816532837067e035ddca8b861652e9c0610f3 (patch)
treed2010cdfe67cf066bd88d2b611250eb425e8fef8
parentdf2b4d3451f357f6a20f5fb1ff53e61983f74710 (diff)
downloadcoreutils-d3b816532837067e035ddca8b861652e9c0610f3.tar.xz
Merge from gnulib.
-rw-r--r--lib/getaddrinfo.h11
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/getaddrinfo.h b/lib/getaddrinfo.h
index 087d3d579..54c9198bb 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