From e35c7dcd72bdcf5b3d491fc61308c346d8a9d489 Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gvanem@broadpark.no>
Date: Fri, 20 Aug 2004 14:10:44 +0000
Subject: More patches for Watt-32 on Win32; don't include "nameser.h".

---
 ares/ares_gethostbyaddr.c   | 7 ++++++-
 ares/ares_gethostbyname.c   | 7 ++++++-
 ares/ares_mkquery.c         | 2 +-
 ares/ares_parse_a_reply.c   | 2 +-
 ares/ares_parse_ptr_reply.c | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c
index 460b556d9..f44b3fb38 100644
--- a/ares/ares_gethostbyaddr.c
+++ b/ares/ares_gethostbyaddr.c
@@ -16,7 +16,7 @@
 #include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -28,9 +28,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "ares.h"
 #include "ares_private.h"
 
+#ifdef WATT32
+#undef WIN32
+#endif
+
 struct addr_query {
   /* Arguments passed to ares_gethostbyaddr() */
   ares_channel channel;
diff --git a/ares/ares_gethostbyname.c b/ares/ares_gethostbyname.c
index 7f6041ed9..b39d53be6 100644
--- a/ares/ares_gethostbyname.c
+++ b/ares/ares_gethostbyname.c
@@ -16,7 +16,7 @@
 #include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
@@ -30,9 +30,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
+
 #include "ares.h"
 #include "ares_private.h"
 
+#ifdef WATT32
+#undef WIN32
+#endif
+
 struct host_query {
   /* Arguments passed to ares_gethostbyname() */
   ares_channel channel;
diff --git a/ares/ares_mkquery.c b/ares/ares_mkquery.c
index 500e9bb71..d2ae66be9 100644
--- a/ares/ares_mkquery.c
+++ b/ares/ares_mkquery.c
@@ -16,7 +16,7 @@
 #include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <netinet/in.h>
diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c
index 045e83320..3e55d8756 100644
--- a/ares/ares_parse_a_reply.c
+++ b/ares/ares_parse_a_reply.c
@@ -16,7 +16,7 @@
 #include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c
index 0cd375f49..888b029cf 100644
--- a/ares/ares_parse_ptr_reply.c
+++ b/ares/ares_parse_ptr_reply.c
@@ -16,7 +16,7 @@
 #include "setup.h"
 #include <sys/types.h>
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(WATT32)
 #include "nameser.h"
 #else
 #include <sys/socket.h>
-- 
cgit v1.2.3