diff options
| -rw-r--r-- | ares__get_hostent.c | 10 | ||||
| -rw-r--r-- | ares_expand_name.c | 4 | ||||
| -rw-r--r-- | ares_expand_string.c | 4 | ||||
| -rw-r--r-- | ares_gethostbyaddr.c | 11 | ||||
| -rw-r--r-- | ares_gethostbyname.c | 13 | ||||
| -rw-r--r-- | ares_getnameinfo.c | 10 | ||||
| -rw-r--r-- | ares_init.c | 14 | ||||
| -rw-r--r-- | ares_mkquery.c | 4 | ||||
| -rw-r--r-- | ares_parse_a_reply.c | 12 | ||||
| -rw-r--r-- | ares_parse_aaaa_reply.c | 10 | ||||
| -rw-r--r-- | ares_parse_ns_reply.c | 12 | ||||
| -rw-r--r-- | ares_parse_ptr_reply.c | 8 | ||||
| -rw-r--r-- | ares_query.c | 4 | ||||
| -rw-r--r-- | ares_send.c | 4 |
14 files changed, 114 insertions, 6 deletions
diff --git a/ares__get_hostent.c b/ares__get_hostent.c index cea95ae..40dad5d 100644 --- a/ares__get_hostent.c +++ b/ares__get_hostent.c @@ -18,11 +18,19 @@ #include "setup.h" #if !defined(WIN32) || defined(WATT32) +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> #endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#endif #include <stdio.h> #include <stdlib.h> diff --git a/ares_expand_name.c b/ares_expand_name.c index 3049970..9c05546 100644 --- a/ares_expand_name.c +++ b/ares_expand_name.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_expand_string.c b/ares_expand_string.c index 0c7211b..5a3ae18 100644 --- a/ares_expand_string.c +++ b/ares_expand_string.c @@ -20,9 +20,13 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> #endif +#endif #include <string.h> #include <stdlib.h> diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c index 7b4a733..1274d5a 100644 --- a/ares_gethostbyaddr.c +++ b/ares_gethostbyaddr.c @@ -19,10 +19,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c index be1f92b..3048bb2 100644 --- a/ares_gethostbyname.c +++ b/ares_gethostbyname.c @@ -20,10 +20,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +#include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> #endif diff --git a/ares_getnameinfo.c b/ares_getnameinfo.c index 82cad1f..8a6d481 100644 --- a/ares_getnameinfo.c +++ b/ares_getnameinfo.c @@ -19,11 +19,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif +#ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_init.c b/ares_init.c index 406bf88..427ee0c 100644 --- a/ares_init.c +++ b/ares_init.c @@ -36,10 +36,22 @@ #include <sys/socket.h> #endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#include <arpa/inet.h> +#endif + +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif + +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif + +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif + #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_mkquery.c b/ares_mkquery.c index 919ddf3..739e235 100644 --- a/ares_mkquery.c +++ b/ares_mkquery.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_parse_a_reply.c b/ares_parse_a_reply.c index 42c4ff7..85af996 100644 --- a/ares_parse_a_reply.c +++ b/ares_parse_a_reply.c @@ -20,11 +20,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_parse_aaaa_reply.c b/ares_parse_aaaa_reply.c index 3070632..812694e 100644 --- a/ares_parse_aaaa_reply.c +++ b/ares_parse_aaaa_reply.c @@ -20,10 +20,18 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif #ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> #endif diff --git a/ares_parse_ns_reply.c b/ares_parse_ns_reply.c index 19dd888..e3a89ab 100644 --- a/ares_parse_ns_reply.c +++ b/ares_parse_ns_reply.c @@ -23,11 +23,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> -#include <arpa/inet.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif +#ifdef HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_parse_ptr_reply.c b/ares_parse_ptr_reply.c index 8d3d40d..4905e84 100644 --- a/ares_parse_ptr_reply.c +++ b/ares_parse_ptr_reply.c @@ -20,10 +20,18 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_NETDB_H #include <netdb.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_query.c b/ares_query.c index 3959c0e..cc3b63a 100644 --- a/ares_query.c +++ b/ares_query.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif diff --git a/ares_send.c b/ares_send.c index 7051897..6dc7b76 100644 --- a/ares_send.c +++ b/ares_send.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include <netinet/in.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H #include <arpa/nameser.h> +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include <arpa/nameser_compat.h> #endif |