diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 12:52:30 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 12:52:30 +0000 |
| commit | 12cec48616032e92c640614d45cc01843bb3db17 (patch) | |
| tree | 42ba39a3e28d01afdd052305901ea82ed8fa7417 /ext | |
| parent | 76fc93643275b55d147f9fc685ccb7c60e72e992 (diff) | |
* win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
* ext/socket/addrinfo.h (addrinfo, getaddrinfo, getnameinfo,
freehostent, freeaddrinfo): undef before define because these are
macros in some versions of Windows SDK.
merged from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/addrinfo.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h index a22615ee00..e93adafba6 100644 --- a/ext/socket/addrinfo.h +++ b/ext/socket/addrinfo.h @@ -61,10 +61,15 @@ #undef NI_NUMERICSERV #undef NI_DGRAM +#undef addrinfo #define addrinfo addrinfo__compat +#undef getaddrinfo #define getaddrinfo getaddrinfo__compat +#undef getnameinfo #define getnameinfo getnameinfo__compat +#undef freehostent #define freehostent freehostent__compat +#undef freeaddrinfo #define freeaddrinfo freeaddrinfo__compat #ifndef __P |