From 1b9c2a3ea31cfd6f69e20e92af4da86339f0bfed Mon Sep 17 00:00:00 2001
From: Gisle Vanem <gvanem@broadpark.no>
Date: Wed, 10 Aug 2011 03:31:39 +0200
Subject: [PATCH] ares_iphlpapi.h: Watcom C fix

  Added "!defined(_WS2DEF_)" since Watcom doesn't have
  a per type guard for the typedefs 'CSADDR_INFO' (that MingW has) or
  'SOCKET_ADDRESS' (that MSVC has). But we can use the header-guard for
  <ws2def.h> instead.
---
 ares_iphlpapi.h | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ares_iphlpapi.h b/ares_iphlpapi.h
index e21d172..343aee3 100644
--- a/ares_iphlpapi.h
+++ b/ares_iphlpapi.h
@@ -27,9 +27,11 @@
 #define INET6_ADDRSTRLEN 65
 #endif
 
-/* ---------------------------------------------------------- */
-#if !defined(__CSADDR_DEFINED__) && !defined(__CSADDR_T_DEFINED)
-/* ---------------------------------------------------------- */
+/* ---------------------------------- */
+#if !defined(_WS2DEF_)           && \
+    !defined(__CSADDR_DEFINED__) && \
+    !defined(__CSADDR_T_DEFINED)
+/* ---------------------------------- */
 
 typedef struct _SOCKET_ADDRESS {
   LPSOCKADDR lpSockaddr;
@@ -43,9 +45,11 @@ typedef struct _CSADDR_INFO {
   INT iProtocol;
 } CSADDR_INFO, *PCSADDR_INFO;
 
-/* --------------------------------------------------- */
-#endif /* ! __CSADDR_DEFINED__ && ! __CSADDR_T_DEFINED */
-/* --------------------------------------------------- */
+/* --------------------------------- */
+#endif /* ! _WS2DEF_           && \  */
+/*        ! __CSADDR_DEFINED__ && \  */
+/*        ! __CSADDR_T_DEFINED       */
+/* --------------------------------- */
 
 /* ------------------------------- */
 #if !defined(IP_ADAPTER_DDNS_ENABLED)