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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
aed7f69bbc
commit
472a49b666
3 changed files with 14 additions and 1 deletions
|
@ -1,3 +1,11 @@
|
|||
Fri Jun 6 20:58:25 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.
|
||||
|
||||
Fri Jun 6 20:13:01 2008 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/setup.mak: maybe commit miss.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -249,7 +249,7 @@ COMMON_MACROS = WIN32_LEAN_AND_MEAN WIN32
|
|||
!if !defined(USE_WINSOCK2)
|
||||
COMMON_HEADERS = winsock.h
|
||||
!else
|
||||
COMMON_HEADERS = winsock2.h
|
||||
COMMON_HEADERS = winsock2.h ws2tcpip.h
|
||||
!endif
|
||||
COMMON_HEADERS = $(COMMON_HEADERS) windows.h
|
||||
!endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue