diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2011-08-10 03:31:39 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2011-08-10 03:31:39 +0200 |
| commit | 1b9c2a3ea31cfd6f69e20e92af4da86339f0bfed (patch) | |
| tree | 80709c0d5453a450a1edef68f208d36a87925268 | |
| parent | 5da497e0e86798194907baebd420bb56c1611209 (diff) | |
| download | c-ares-1b9c2a3ea31cfd6f69e20e92af4da86339f0bfed.tar.gz c-ares-1b9c2a3ea31cfd6f69e20e92af4da86339f0bfed.tar.bz2 c-ares-1b9c2a3ea31cfd6f69e20e92af4da86339f0bfed.zip | |
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.
| -rw-r--r-- | ares_iphlpapi.h | 16 |
1 files 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) |