From f214b583f5a0439f63258dd0c21b2a5045b822c8 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 17 Sep 2008 01:02:57 +0000 Subject: [PATCH] adjust inclusion of "nameser.h" --- adig.c | 37 +++++++++++++++++++++++-------------- ares_expand_name.c | 12 +++++------- ares_expand_string.c | 10 ++++------ ares_gethostbyaddr.c | 18 ++++++++---------- ares_gethostbyname.c | 21 ++++++++------------- ares_getnameinfo.c | 18 ++++++++---------- ares_init.c | 14 +++++++------- ares_mkquery.c | 12 +++++------- ares_parse_a_reply.c | 21 ++++++++++----------- ares_parse_aaaa_reply.c | 21 ++++++++++----------- ares_parse_ns_reply.c | 18 ++++++++---------- ares_parse_ptr_reply.c | 19 +++++++++---------- ares_process.c | 32 +++++++++++++++----------------- ares_query.c | 12 +++++------- ares_search.c | 5 +---- ares_send.c | 12 +++++------- inet_net_pton.c | 21 ++++++++++----------- inet_ntop.c | 19 ++++++++++--------- nameser.h | 8 ++++---- windows_port.c | 15 --------------- 20 files changed, 155 insertions(+), 190 deletions(-) diff --git a/adig.c b/adig.c index 031ce81..66b64a4 100644 --- a/adig.c +++ b/adig.c @@ -17,26 +17,35 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else -#ifdef HAVE_SYS_TIME_H -#include +#ifdef HAVE_SYS_SOCKET_H +# include +#endif +#ifdef HAVE_NETINET_IN_H +# include +#endif +#ifdef HAVE_ARPA_INET_H +# include +#endif +#ifdef HAVE_NETDB_H +# include +#endif +#ifdef HAVE_ARPA_NAMESER_H +# include +#else +# include "nameser.h" #endif -#include -#include -#include -#include #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include +# include +#endif + +#ifdef HAVE_SYS_TIME_H +# include #endif #ifdef HAVE_UNISTD_H -#include -#endif -#include +# include #endif #ifdef HAVE_STRINGS_H -#include +# include #endif #include diff --git a/ares_expand_name.c b/ares_expand_name.c index 9c05546..dc5b107 100644 --- a/ares_expand_name.c +++ b/ares_expand_name.c @@ -17,18 +17,16 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #include diff --git a/ares_expand_string.c b/ares_expand_string.c index 5a3ae18..ead60a4 100644 --- a/ares_expand_string.c +++ b/ares_expand_string.c @@ -17,15 +17,13 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include -#endif +# include +#else +# include "nameser.h" #endif #include diff --git a/ares_gethostbyaddr.c b/ares_gethostbyaddr.c index 1274d5a..85e2e39 100644 --- a/ares_gethostbyaddr.c +++ b/ares_gethostbyaddr.c @@ -16,27 +16,25 @@ */ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #include diff --git a/ares_gethostbyname.c b/ares_gethostbyname.c index 3048bb2..a32da8f 100644 --- a/ares_gethostbyname.c +++ b/ares_gethostbyname.c @@ -17,30 +17,25 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include -#endif -#ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #include diff --git a/ares_getnameinfo.c b/ares_getnameinfo.c index 8a6d481..99d3b87 100644 --- a/ares_getnameinfo.c +++ b/ares_getnameinfo.c @@ -16,27 +16,25 @@ */ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #ifdef HAVE_NET_IF_H diff --git a/ares_init.c b/ares_init.c index d4e1505..4d4ba1e 100644 --- a/ares_init.c +++ b/ares_init.c @@ -19,11 +19,10 @@ #include "setup.h" #if defined(WIN32) && !defined(WATT32) -#include "nameser.h" #include #include +#endif -#else #ifdef HAVE_SYS_PARAM_H #include #endif @@ -49,16 +48,17 @@ #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" +#endif +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +# include #endif -#ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif #ifdef HAVE_UNISTD_H #include #endif -#endif #include #include diff --git a/ares_mkquery.c b/ares_mkquery.c index 739e235..a9c9187 100644 --- a/ares_mkquery.c +++ b/ares_mkquery.c @@ -17,18 +17,16 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #include diff --git a/ares_parse_a_reply.c b/ares_parse_a_reply.c index 85af996..6380f5b 100644 --- a/ares_parse_a_reply.c +++ b/ares_parse_a_reply.c @@ -17,30 +17,29 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif + #ifdef HAVE_STRINGS_H -#include +# include #endif #include diff --git a/ares_parse_aaaa_reply.c b/ares_parse_aaaa_reply.c index 812694e..6a43f93 100644 --- a/ares_parse_aaaa_reply.c +++ b/ares_parse_aaaa_reply.c @@ -17,30 +17,29 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif + #ifdef HAVE_STRINGS_H -#include +# include #endif #include diff --git a/ares_parse_ns_reply.c b/ares_parse_ns_reply.c index e3a89ab..9eed3eb 100644 --- a/ares_parse_ns_reply.c +++ b/ares_parse_ns_reply.c @@ -20,27 +20,25 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #include diff --git a/ares_parse_ptr_reply.c b/ares_parse_ptr_reply.c index 4905e84..13ff652 100644 --- a/ares_parse_ptr_reply.c +++ b/ares_parse_ptr_reply.c @@ -17,27 +17,26 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif + #ifdef HAVE_STRINGS_H -#include +# include #endif #include diff --git a/ares_process.c b/ares_process.c index 824640e..798df7a 100644 --- a/ares_process.c +++ b/ares_process.c @@ -18,47 +18,45 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" - -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_SYS_UIO_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include /* may need it */ +# include #endif #ifdef HAVE_NETINET_TCP_H -#include /* for TCP_NODELAY */ +# include #endif #ifdef HAVE_NETDB_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include +# include #endif + #ifdef HAVE_SYS_TIME_H -#include +# include #endif -#endif /* WIN32 && !WATT32 */ #ifdef HAVE_STRINGS_H -#include +# include #endif #ifdef HAVE_UNISTD_H -#include +# include #endif #ifdef HAVE_SYS_IOCTL_H -#include +# include #endif #ifdef NETWARE -#include +# include #endif #include diff --git a/ares_query.c b/ares_query.c index cc3b63a..2582459 100644 --- a/ares_query.c +++ b/ares_query.c @@ -17,18 +17,16 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #include diff --git a/ares_search.c b/ares_search.c index c65f70f..3ba26fe 100644 --- a/ares_search.c +++ b/ares_search.c @@ -16,16 +16,13 @@ */ #include "setup.h" + #include #include #include #include #include -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#endif - #include "ares.h" #include "ares_private.h" diff --git a/ares_send.c b/ares_send.c index 6dc7b76..a5811d3 100644 --- a/ares_send.c +++ b/ares_send.c @@ -17,18 +17,16 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_NETINET_IN_H -#include +# include #endif #ifdef HAVE_ARPA_NAMESER_H -#include +# include +#else +# include "nameser.h" #endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include -#endif +# include #endif #include diff --git a/inet_net_pton.c b/inet_net_pton.c index 487cd82..0936aa1 100644 --- a/inet_net_pton.c +++ b/inet_net_pton.c @@ -19,23 +19,22 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else - #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_NAMESER_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif - +#ifdef HAVE_ARPA_NAMESER_H +# include +#else +# include "nameser.h" +#endif +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +# include #endif #include diff --git a/inet_ntop.c b/inet_ntop.c index d07e19e..914576f 100644 --- a/inet_ntop.c +++ b/inet_ntop.c @@ -18,21 +18,22 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" -#else #ifdef HAVE_SYS_SOCKET_H -#include +# include #endif #ifdef HAVE_NETINET_IN_H -#include -#endif -#ifdef HAVE_ARPA_NAMESER_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif +#ifdef HAVE_ARPA_NAMESER_H +# include +#else +# include "nameser.h" +#endif +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +# include #endif #include diff --git a/nameser.h b/nameser.h index 52c2972..3d80096 100644 --- a/nameser.h +++ b/nameser.h @@ -5,7 +5,7 @@ /* header file provided by liren@vivisimo.com */ - +#ifndef HAVE_ARPA_NAMESER_H #define NS_PACKETSZ 512 /* maximum packet size */ #define NS_MAXDNAME 256 /* maximum domain name */ @@ -117,9 +117,9 @@ typedef enum __ns_rcode { ns_r_badtime = 18 } ns_rcode; +#endif /* HAVE_ARPA_NAMESER_H */ - - +#ifndef HAVE_ARPA_NAMESER_COMPAT_H #define PACKETSZ NS_PACKETSZ #define MAXDNAME NS_MAXDNAME @@ -189,6 +189,6 @@ typedef enum __ns_rcode { #define T_MAILA ns_t_maila #define T_ANY ns_t_any - +#endif /* HAVE_ARPA_NAMESER_COMPAT_H */ #endif /* ARES_NAMESER_H */ diff --git a/windows_port.c b/windows_port.c index cc31036..fd13b14 100644 --- a/windows_port.c +++ b/windows_port.c @@ -5,20 +5,6 @@ /* only do the following on windows */ #if (defined(WIN32) || defined(WATT32)) && !defined(MSDOS) -#include -#include -#include -#include -#include -#include - -#ifdef WATT32 -#include -#else -#include "nameser.h" -#endif -#include "ares.h" -#include "ares_private.h" #ifdef __WATCOMC__ /* @@ -34,5 +20,4 @@ WINAPI DllMain (HINSTANCE hnd, DWORD reason, LPVOID reserved) } #endif - #endif /* WIN32 builds only */