diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 12:19:21 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 12:19:21 +0000 |
| commit | 9e469fbac28ebeedd3c5f9272c2552daacc59c29 (patch) | |
| tree | 11629a290e64a0ee9a4e7bfcc8abd4950fe27c1e /ext | |
| parent | 2b785b0f3e4f902e7de29a895d1f6ae0f10c3265 (diff) | |
Merge changes from ruby_1_8 that fixes build with Visual C++ 8 with
Winsock2.
* 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.
* win32/setup.mak: maybe commit miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16866 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 |