include header file only when available

diff --git a/ares/ares__get_hostent.c b/ares/ares__get_hostent.c
index cea95aed73631799fac9d629e913169f052152f3..40dad5d56c22b154280f832e9deadd75ac93eedd 100644 (file)
--- 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 <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/ares_expand_name.c b/ares/ares_expand_name.c
index 30499702a84d204414f87b3d28e840ccfd93c10b..9c05546db72b893f302379d36b4f5bd36d0dab71 100644 (file)
--- 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 <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/ares_expand_string.c b/ares/ares_expand_string.c
index 0c7211ba2c97e6f9725ffccc24932b3fd70220d4..5a3ae182cc6c27d2f1e9d3162949bd6eb28a661e 100644 (file)
--- 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 <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/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c
index 7b4a733c36b33ca70689ba4cc2cb1d8c4679b7ae..1274d5acc264d41d7198194ac1a7fab9d15aa208 100644 (file)
--- 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 <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/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index be1f92b216cd5fa35986091faa24d4c2db0b2870..3048bb258ea59ba39eb8922279a2d348e6bb9c40 100644 (file)
--- 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 <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/ares_getnameinfo.c b/ares/ares_getnameinfo.c
index 82cad1fde6f6d09a6a4e34842cf05a1fc46510e6..8a6d4811e28dc33034174d081c411f20a6e6da90 100644 (file)
--- 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 <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/ares_init.c b/ares/ares_init.c
index 406bf88f47d4164056112f991c9efb9bb811b46c..427ee0cc323269e84a2004cf3925208aa222405b 100644 (file)
--- a/ares/ares_init.c
+++ b/ares/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/ares_mkquery.c b/ares/ares_mkquery.c
index 919ddf3a06ecdba7dd32822447f444163289f949..739e235b7ba77d4c01b42bd2700134939cb68053 100644 (file)
--- 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 <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/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c
index 42c4ff7f21c2cfa2e80afe0b4c0ffa6185f4e234..85af9964381bba399581bd13ad26cb7d83a93e75 100644 (file)
--- 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 <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/ares_parse_aaaa_reply.c b/ares/ares_parse_aaaa_reply.c
index 30706328b3b2796f94545536b5c88e02c621183b..812694eb2304d7501db66de639e8fa3b4c17fd05 100644 (file)
--- 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 <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/ares_parse_ns_reply.c b/ares/ares_parse_ns_reply.c
index 19dd88870471d11883f616a6c7f46f725487bafd..e3a89abb42ce6223f58b69df92adddc005f91b6f 100644 (file)
--- 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 <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/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c
index 8d3d40dd51502b12a901c162f0e42a876035c3e5..4905e8457c8f5b943c9b33422c2ae97907e8237d 100644 (file)
--- 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 <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/ares_query.c b/ares/ares_query.c
index 3959c0e3f4cf2d2e6a7f88341b91659114d6d84b..cc3b63af816d05687f79a130685a62617a94a0bf 100644 (file)
--- 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 <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/ares_send.c b/ares/ares_send.c
index 70518973a85f376f4af257f42c7b2c048b519efd..6dc7b762bd3a4b1012cc707b9080570ce7a036c1 100644 (file)
--- 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 <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