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 | 10e5dc5ffd7d7929701f2af71b7cd7e3cb7f46c6 (patch) | |
| tree | 42ba39a3e28d01afdd052305901ea82ed8fa7417 | |
| parent | 4d0e7ebff913b8d60b65051a87d5238d2c61fe17 (diff) | |
| download | ruby-10e5dc5ffd7d7929701f2af71b7cd7e3cb7f46c6.tar.gz ruby-10e5dc5ffd7d7929701f2af71b7cd7e3cb7f46c6.tar.xz ruby-10e5dc5ffd7d7929701f2af71b7cd7e3cb7f46c6.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@16867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/socket/addrinfo.h | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 |
3 files changed, 16 insertions, 1 deletions
@@ -1,3 +1,13 @@ +Fri Jun 6 21:51:46 2008 NAKAMURA Usaku <usa@ruby-lang.org> + + * 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. + Fri Jun 6 18:25:43 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/iconv/utils.rb (default_test): override not to croak. diff --git a/ext/socket/addrinfo.h b/ext/socket/addrinfo.h index a22615ee0..e93adafba 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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d7166f801..2f90b31a0 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -261,7 +261,7 @@ COMMON_LIBS = m COMMON_MACROS = WIN32_LEAN_AND_MEAN WIN32 !endif !ifndef COMMON_HEADERS -COMMON_HEADERS = winsock2.h windows.h +COMMON_HEADERS = winsock2.h ws2tcpip.h windows.h !endif arch_hdrdir = $(EXTOUT)/include/$(arch) |