knu	2008-06-06 21:19:21 +0900 (Fri, 06 Jun 2008)

  New Revision: 16866

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/socket/addrinfo.h
    branches/ruby_1_8_7/version.h
    branches/ruby_1_8_7/win32/Makefile.sub
    branches/ruby_1_8_7/win32/setup.mak

  Log:
    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.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ext/socket/addrinfo.h?r1=16866&r2=16865&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/win32/Makefile.sub?r1=16866&r2=16865&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=16866&r2=16865&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/win32/setup.mak?r1=16866&r2=16865&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=16866&r2=16865&diff_format=u

Index: ruby_1_8_7/ext/socket/addrinfo.h
===================================================================
--- ruby_1_8_7/ext/socket/addrinfo.h	(revision 16865)
+++ ruby_1_8_7/ext/socket/addrinfo.h	(revision 16866)
@@ -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
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 16865)
+++ ruby_1_8_7/ChangeLog	(revision 16866)
@@ -1,3 +1,13 @@
+Fri Jun  6 21:16:55 2008  NAKAMURA Usaku  <usa@r...>
+
+	* 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@i...>
 
 	* mkconfig.rb: hide build path from rbconfig.rb.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 16865)
+++ ruby_1_8_7/version.h	(revision 16866)
@@ -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
Index: ruby_1_8_7/win32/Makefile.sub
===================================================================
--- ruby_1_8_7/win32/Makefile.sub	(revision 16865)
+++ ruby_1_8_7/win32/Makefile.sub	(revision 16866)
@@ -249,7 +249,7 @@
 !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
Index: ruby_1_8_7/win32/setup.mak
===================================================================
--- ruby_1_8_7/win32/setup.mak	(revision 16865)
+++ ruby_1_8_7/win32/setup.mak	(revision 16866)
@@ -41,8 +41,8 @@
 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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/