From db80e18308e40d3ef7f0f711be2de1ae23a34242 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Mon, 15 Sep 2008 17:14:29 +0000 Subject: [PATCH] include header file only when available --- ares/ares__get_hostent.c | 10 +++++++++- ares/ares_expand_name.c | 4 ++++ ares/ares_expand_string.c | 4 ++++ ares/ares_gethostbyaddr.c | 11 +++++++++++ ares/ares_gethostbyname.c | 13 ++++++++++++- ares/ares_getnameinfo.c | 10 ++++++++++ ares/ares_init.c | 14 +++++++++++++- ares/ares_mkquery.c | 4 ++++ ares/ares_parse_a_reply.c | 12 +++++++++++- ares/ares_parse_aaaa_reply.c | 10 +++++++++- ares/ares_parse_ns_reply.c | 12 +++++++++++- ares/ares_parse_ptr_reply.c | 8 ++++++++ ares/ares_query.c | 4 ++++ ares/ares_send.c | 4 ++++ 14 files changed, 114 insertions(+), 6 deletions(-) diff --git a/ares/ares__get_hostent.c b/ares/ares__get_hostent.c index cea95aed73..40dad5d56c 100644 --- a/ares/ares__get_hostent.c +++ b/ares/ares__get_hostent.c @@ -18,11 +18,19 @@ #include "setup.h" #if !defined(WIN32) || defined(WATT32) +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include -#include +#endif +#ifdef HAVE_NETDB_H #include #endif +#ifdef HAVE_ARPA_INET_H +#include +#endif +#endif #include #include diff --git a/ares/ares_expand_name.c b/ares/ares_expand_name.c index 30499702a8..9c05546db7 100644 --- a/ares/ares_expand_name.c +++ b/ares/ares_expand_name.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_expand_string.c b/ares/ares_expand_string.c index 0c7211ba2c..5a3ae182cc 100644 --- a/ares/ares_expand_string.c +++ b/ares/ares_expand_string.c @@ -20,9 +20,13 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include #endif +#endif #include #include diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c index 7b4a733c36..1274d5acc2 100644 --- a/ares/ares_gethostbyaddr.c +++ b/ares/ares_gethostbyaddr.c @@ -19,10 +19,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c index be1f92b216..3048bb258e 100644 --- a/ares/ares_gethostbyname.c +++ b/ares/ares_gethostbyname.c @@ -20,10 +20,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include -#include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif +#ifdef HAVE_ARPA_NAMESER_H +#include +#endif #ifdef HAVE_ARPA_NAMESER_H #include #endif diff --git a/ares/ares_getnameinfo.c b/ares/ares_getnameinfo.c index 82cad1fde6..8a6d4811e2 100644 --- a/ares/ares_getnameinfo.c +++ b/ares/ares_getnameinfo.c @@ -19,11 +19,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_ARPA_INET_H #include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_init.c b/ares/ares_init.c index 406bf88f47..427ee0cc32 100644 --- a/ares/ares_init.c +++ b/ares/ares_init.c @@ -36,10 +36,22 @@ #include #endif +#ifdef HAVE_NETINET_IN_H #include -#include +#endif + +#ifdef HAVE_NETDB_H #include +#endif + +#ifdef HAVE_ARPA_INET_H +#include +#endif + +#ifdef HAVE_ARPA_NAMESER_H #include +#endif + #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_mkquery.c b/ares/ares_mkquery.c index 919ddf3a06..739e235b7b 100644 --- a/ares/ares_mkquery.c +++ b/ares/ares_mkquery.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c index 42c4ff7f21..85af996438 100644 --- a/ares/ares_parse_a_reply.c +++ b/ares/ares_parse_a_reply.c @@ -20,11 +20,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include -#include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_parse_aaaa_reply.c b/ares/ares_parse_aaaa_reply.c index 30706328b3..812694eb23 100644 --- a/ares/ares_parse_aaaa_reply.c +++ b/ares/ares_parse_aaaa_reply.c @@ -20,10 +20,18 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include -#include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif #ifdef HAVE_ARPA_NAMESER_H #include #endif diff --git a/ares/ares_parse_ns_reply.c b/ares/ares_parse_ns_reply.c index 19dd888704..e3a89abb42 100644 --- a/ares/ares_parse_ns_reply.c +++ b/ares/ares_parse_ns_reply.c @@ -23,11 +23,21 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include -#include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_ARPA_INET_H +#include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c index 8d3d40dd51..4905e8457c 100644 --- a/ares/ares_parse_ptr_reply.c +++ b/ares/ares_parse_ptr_reply.c @@ -20,10 +20,18 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_SYS_SOCKET_H #include +#endif +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_NETDB_H #include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_query.c b/ares/ares_query.c index 3959c0e3f4..cc3b63af81 100644 --- a/ares/ares_query.c +++ b/ares/ares_query.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif diff --git a/ares/ares_send.c b/ares/ares_send.c index 70518973a8..6dc7b762bd 100644 --- a/ares/ares_send.c +++ b/ares/ares_send.c @@ -20,8 +20,12 @@ #if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else +#ifdef HAVE_NETINET_IN_H #include +#endif +#ifdef HAVE_ARPA_NAMESER_H #include +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H #include #endif -- 2.47.3