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 | |
| 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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | ext/socket/addrinfo.h | 5 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rw-r--r-- | win32/setup.mak | 4 |
5 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,13 @@ +Fri Jun 6 21:16:55 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. + + * win32/setup.mak: maybe commit miss. + Fri Jun 6 19:34:22 2008 Akinori MUSHA <knu@iDaemons.org> * mkconfig.rb: hide build path from rbconfig.rb. 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 @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-06" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20080606 -#define RUBY_PATCHLEVEL 9 +#define RUBY_PATCHLEVEL 10 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 972e6933f5..1301d86fff 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -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 diff --git a/win32/setup.mak b/win32/setup.mak index e87d1dbf39..1df2e2ed33 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -41,8 +41,8 @@ MAKE = nmake srcdir = $(srcdir:\=/) prefix = $(prefix:\=/) EXTSTATIC = $(EXTSTATIC) -!if "$(USE_WINSOCK2)" != "0" -USE_WINSOCK2 = 1 +!if defined(USE_WINSOCK2) +USE_WINSOCK2 = $(USE_WINSOCK2) !endif !if defined(RDOCTARGET) RDOCTARGET = $(RDOCTARGET) |