Added some checks for the addrinfo structure.

diff --git a/ares/CHANGES b/ares/CHANGES
index 678319dad6462af2dcfbaf0e02b8ef04590b92e3..16422491853755da36d0a02d75729c5882f1b599 100644 (file)
--- a/ares/CHANGES
+++ b/ares/CHANGES
@@ -1,5 +1,9 @@
   Changelog for the c-ares project
 
+* June 19
+
+- Added some checks for the addrinfo structure.
+
 * June 2
 
 - William Ahern:
@@ -20,7 +24,6 @@
   value. If q is not greater than *s then it's equal and *s is always
   allocated with at least one byte.
 
-
 * May 16
 
 - Added ares_getnameinfo which mimics the getnameinfo API (another feature

diff --git a/ares/ares_ipv6.h b/ares/ares_ipv6.h
index 79a37c4012aac442495d8fe5cb1c56e1864ee59d..a6d980fe73ce633e82b830173e4605fe0be0cdc8 100644 (file)
--- a/ares/ares_ipv6.h
+++ b/ares/ares_ipv6.h
@@ -39,6 +39,20 @@ struct sockaddr_in6
 };
 #endif
 
+#ifndef HAVE_STRUCT_ADDRINFO
+struct addrinfo
+{
+  int ai_flags;
+  int ai_family;
+  int ai_socktype;
+  int ai_protocol;
+  size_t ai_addrlen;
+  char *ai_cannonname;
+  struct sockaddr *ai_addr;
+  struct addrinfo *ai_next;
+};
+#endif
+
 #ifndef NS_IN6ADDRSZ
 #if SIZEOF_STRUCT_IN6_ADDR == 0
 /* We cannot have it set to zero, so we pick a fixed value here */

diff --git a/ares/configure.ac b/ares/configure.ac
index 6f5100b235c0c71ccf7e8166692f785b1b168aa1..73901394a53b8bd1b4c3b63bd4610702f0b5fd47 100644 (file)
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -193,6 +193,23 @@ CARES_CHECK_STRUCT_MEMBER(
 )\r
 fi\r
 \r
+dnl check for the addrinfo structure\r
+CARES_CHECK_STRUCT(\r
+  [\r
+#ifdef HAVE_SYS_TYPES_H\r
+#include <sys/types.h>\r
+#endif\r
+#ifdef HAVE_WINSOCK_H\r
+#include <winsock.h>\r
+#endif\r
+#ifdef HAVE_NETINET_IN_H\r
+#include <netinet/in.h>\r
+#endif\r
+  ], [addrinfo], \r
+     AC_DEFINE_UNQUOTED(HAVE_STRUCT_ADDRINFO,1,\r
+       [Define to 1 if you have struct addrinfo.])\r
+)\r
+\r
 dnl check for inet_pton\r
 AC_CHECK_FUNCS(inet_pton)\r
 dnl Some systems have it, but not IPv6\r