usa	2008-06-06 21:52:30 +0900 (Fri, 06 Jun 2008)

  New Revision: 16867

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/addrinfo.h
    trunk/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.
    
      merged from ruby_1_8.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/socket/addrinfo.h?r1=16867&r2=16866&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16867&r2=16866&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=16867&r2=16866&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16866)
+++ ChangeLog	(revision 16867)
@@ -1,3 +1,13 @@
+Fri Jun  6 21:51:46 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.
+
+	  merged from ruby_1_8.
+
 Fri Jun  6 18:25:43 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/iconv/utils.rb (default_test): override not to croak.
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 16866)
+++ win32/Makefile.sub	(revision 16867)
@@ -261,7 +261,7 @@
 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)
Index: ext/socket/addrinfo.h
===================================================================
--- ext/socket/addrinfo.h	(revision 16866)
+++ ext/socket/addrinfo.h	(revision 16867)
@@ -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

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