More patches for Watt-32 on Win32; don't include "nameser.h".

21 years ago · 0f51a17667
parent 32fded8229
commit 0f51a17667
5 changed files with 15 additions and 5 deletions
--- a/ares_gethostbyaddr.c
+++ b/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;
--- a/ares_gethostbyname.c
+++ b/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;
--- a/ares_mkquery.c
+++ b/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>
--- a/ares_parse_a_reply.c
+++ b/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>
--- a/ares_parse_ptr_reply.c
+++ b/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>