summaryrefslogtreecommitdiff
path: root/ares_process.c
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2008-09-17 01:02:57 +0000
committerYang Tse <yangsita@gmail.com>2008-09-17 01:02:57 +0000
commitf214b583f5a0439f63258dd0c21b2a5045b822c8 (patch)
treef040ae2b7239873b6b7f32035c61a3b989ce1104 /ares_process.c
parent861ea67ee80d47634b9ad2474a354a61a42f7965 (diff)
downloadc-ares-f214b583f5a0439f63258dd0c21b2a5045b822c8.tar.gz
c-ares-f214b583f5a0439f63258dd0c21b2a5045b822c8.tar.bz2
c-ares-f214b583f5a0439f63258dd0c21b2a5045b822c8.zip
adjust inclusion of "nameser.h"
Diffstat (limited to 'ares_process.c')
-rw-r--r--ares_process.c32
1 files changed, 15 insertions, 17 deletions
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>