shyouhei	2008-06-27 17:20:55 +0900 (Fri, 27 Jun 2008)

  New Revision: 17604

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/version.h
    branches/ruby_1_8_6/win32/win32.h

  Log:
    merge revision(s) 16855:
    * win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/ChangeLog?r1=17604&r2=17603&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17604&r2=17603&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/win32/win32.h?r1=17604&r2=17603&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17603)
+++ ruby_1_8_6/ChangeLog	(revision 17604)
@@ -1,3 +1,7 @@
+Fri Jun 27 17:20:40 2008  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
+
 Fri Jun 27 15:57:05 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/iconv/iconv.c (iconv_iconv): fixed backport miss.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17603)
+++ ruby_1_8_6/version.h	(revision 17604)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-27"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20080627
-#define RUBY_PATCHLEVEL 233
+#define RUBY_PATCHLEVEL 234
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/win32/win32.h
===================================================================
--- ruby_1_8_6/win32/win32.h	(revision 17603)
+++ ruby_1_8_6/win32/win32.h	(revision 17604)
@@ -27,6 +27,7 @@
 #endif
 #ifdef USE_WINSOCK2
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <windows.h>
 #else
 #include <windows.h>

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