[Cvs-cvs] Changes to ccvs/m4/getaddrinfo.m4

[Derek Robert Price]

Index: ccvs/m4/getaddrinfo.m4
diff -u ccvs/m4/getaddrinfo.m4:1.2 ccvs/m4/getaddrinfo.m4:1.3
--- ccvs/m4/getaddrinfo.m4:1.2  Tue Oct  4 02:33:12 2005
+++ ccvs/m4/getaddrinfo.m4      Thu Oct 20 21:08:46 2005
@@ -1,4 +1,4 @@
-# getaddrinfo.m4 serial 6
+# getaddrinfo.m4 serial 7
 dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -19,30 +19,18 @@
   AC_REQUIRE([gl_SOCKET_FAMILIES])
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_GNU_SOURCE])
-  AC_CHECK_HEADERS_ONCE(sys/socket.h netdb.h sys/types.h netinet/in.h)
+  AC_CHECK_HEADERS_ONCE(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
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 ])
   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
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
 ])
 ])