mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
76fc936432
commit
12cec48616
3 changed files with 16 additions and 1 deletions
10
ChangeLog
10
ChangeLog
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue