summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--adig.c35
-rw-r--r--ares_expand_name.c12
-rw-r--r--ares_expand_string.c10
-rw-r--r--ares_gethostbyaddr.c18
-rw-r--r--ares_gethostbyname.c21
-rw-r--r--ares_getnameinfo.c18
-rw-r--r--ares_init.c12
-rw-r--r--ares_mkquery.c12
-rw-r--r--ares_parse_a_reply.c21
-rw-r--r--ares_parse_aaaa_reply.c21
-rw-r--r--ares_parse_ns_reply.c18
-rw-r--r--ares_parse_ptr_reply.c19
-rw-r--r--ares_process.c32
-rw-r--r--ares_query.c12
-rw-r--r--ares_search.c5
-rw-r--r--ares_send.c12
-rw-r--r--inet_net_pton.c21
-rw-r--r--inet_ntop.c19
-rw-r--r--nameser.h8
-rw-r--r--windows_port.c15
20 files changed, 153 insertions, 188 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"
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+# include <arpa/inet.h>
+#endif
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+# include <arpa/nameser.h>
#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+# include "nameser.h"
#endif
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <arpa/nameser.h>
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
+# include <arpa/nameser_compat.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
#endif
-#include <netdb.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
#endif
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
#endif
#include <stdio.h>
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 <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
#include <stdlib.h>
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 <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#include <string.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
#endif
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
#include <stdio.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
-#include <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>
+# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
#include <stdio.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
#endif
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#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 <iphlpapi.h>
#include <malloc.h>
+#endif
-#else
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
@@ -49,16 +48,17 @@
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
-
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
+# include <arpa/nameser_compat.h>
#endif
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#endif
#include <stdio.h>
#include <stdlib.h>
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 <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
#include <stdlib.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
#endif
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
+
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
#endif
#include <stdlib.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
#endif
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
+
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
#endif
#include <stdlib.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
#endif
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
#include <stdlib.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
+
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
#endif
#include <stdlib.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_SYS_UIO_H
-#include <sys/uio.h>
+# include <sys/uio.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h> /* <netinet/tcp.h> may need it */
+# include <netinet/in.h>
#endif
#ifdef HAVE_NETINET_TCP_H
-#include <netinet/tcp.h> /* for TCP_NODELAY */
+# include <netinet/tcp.h>
#endif
#ifdef HAVE_NETDB_H
-#include <netdb.h>
+# include <netdb.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
+# include <arpa/nameser_compat.h>
#endif
+
#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
+# include <sys/time.h>
#endif
-#endif /* WIN32 && !WATT32 */
#ifdef HAVE_STRINGS_H
-#include <strings.h>
+# include <strings.h>
#endif
#ifdef HAVE_UNISTD_H
-#include <unistd.h>
+# include <unistd.h>
#endif
#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
+# include <sys/ioctl.h>
#endif
#ifdef NETWARE
-#include <sys/filio.h>
+# include <sys/filio.h>
#endif
#include <assert.h>
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 <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
#include <stdlib.h>
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 <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <errno.h>
-#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 <netinet/in.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
-#include <arpa/nameser_compat.h>
-#endif
+# include <arpa/nameser_compat.h>
#endif
#include <stdlib.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
#endif
-
+#ifdef HAVE_ARPA_NAMESER_H
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
+#endif
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+# include <arpa/nameser_compat.h>
#endif
#include <ctype.h>
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 <sys/socket.h>
+# include <sys/socket.h>
#endif
#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
+# include <netinet/in.h>
#endif
#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
+# include <arpa/inet.h>
+#endif
+#ifdef HAVE_ARPA_NAMESER_H
+# include <arpa/nameser.h>
+#else
+# include "nameser.h"
#endif
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+# include <arpa/nameser_compat.h>
#endif
#include <ctype.h>
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 <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <malloc.h>
-
-#ifdef WATT32
-#include <sys/socket.h>
-#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 */