Skip to content
Browse files

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.
  • Loading branch information...
1 parent 5da497e commit 1b9c2a3ea31cfd6f69e20e92af4da86339f0bfed Gisle Vanem committed with yangtse
Showing with 10 additions and 6 deletions.
  1. +10 −6 ares_iphlpapi.h
View
16 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)

0 comments on commit 1b9c2a3

Please sign in to comment.
Something went wrong with that request. Please try again.