diff --git a/ares/ares_gethostbyaddr.c b/ares/ares_gethostbyaddr.c index 460b556d9d2bbda01785e2d5875cc6802a7dab08..f44b3fb38ec01f6510d230550e8ef582a1e65dde 100644 --- a/ares/ares_gethostbyaddr.c +++ b/ares/ares_gethostbyaddr.c @@ -16,7 +16,7 @@ #include "setup.h" #include -#ifdef WIN32 +#if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else #include @@ -28,9 +28,14 @@ #include #include #include + #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 7f6041ed92864c0e7aeb26466937af96cf3fb772..b39d53be66a83e00d0a8ca359bc4bfe2d444a3d5 100644 --- a/ares/ares_gethostbyname.c +++ b/ares/ares_gethostbyname.c @@ -16,7 +16,7 @@ #include "setup.h" #include -#ifdef WIN32 +#if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else #include @@ -30,9 +30,14 @@ #include #include #include + #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 500e9bb7127b6d7535006e76a8f3d776834825a0..d2ae66be95cc001128950595aa8f968523ecd00a 100644 --- a/ares/ares_mkquery.c +++ b/ares/ares_mkquery.c @@ -16,7 +16,7 @@ #include "setup.h" #include -#ifdef WIN32 +#if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else #include diff --git a/ares/ares_parse_a_reply.c b/ares/ares_parse_a_reply.c index 045e833200e69a53594af326263313cf0dbdfd02..3e55d87568ce4e446d6199a3efd785596674b943 100644 --- a/ares/ares_parse_a_reply.c +++ b/ares/ares_parse_a_reply.c @@ -16,7 +16,7 @@ #include "setup.h" #include -#ifdef WIN32 +#if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else #include diff --git a/ares/ares_parse_ptr_reply.c b/ares/ares_parse_ptr_reply.c index 0cd375f49d0993e891e1222644bcb87b462acc71..888b029cf228c3f9bb9bd8d2079bed294445b10e 100644 --- a/ares/ares_parse_ptr_reply.c +++ b/ares/ares_parse_ptr_reply.c @@ -16,7 +16,7 @@ #include "setup.h" #include -#ifdef WIN32 +#if defined(WIN32) && !defined(WATT32) #include "nameser.h" #else #include