usa	2008-06-06 21:00:56 +0900 (Fri, 06 Jun 2008)

  New Revision: 16865

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/ext/socket/addrinfo.h
    branches/ruby_1_8/win32/Makefile.sub

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


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

Index: ruby_1_8/ext/socket/addrinfo.h
===================================================================
--- ruby_1_8/ext/socket/addrinfo.h	(revision 16864)
+++ ruby_1_8/ext/socket/addrinfo.h	(revision 16865)
@@ -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/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16864)
+++ ruby_1_8/ChangeLog	(revision 16865)
@@ -1,3 +1,11 @@
+Fri Jun  6 20:58:25 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.
+
 Fri Jun  6 20:13:01 2008  NAKAMURA Usaku  <usa@r...>
 
 	* win32/setup.mak: maybe commit miss.
Index: ruby_1_8/win32/Makefile.sub
===================================================================
--- ruby_1_8/win32/Makefile.sub	(revision 16864)
+++ ruby_1_8/win32/Makefile.sub	(revision 16865)
@@ -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

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