shyouhei	2010-11-24 16:38:37 +0900 (Wed, 24 Nov 2010)

  New Revision: 29906

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29906

  Log:
    merge revision(s) 29901:
    
    * ext/socket/extconf.rb (getaddrinfo): should initialize winsock on
      windows.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/ext/socket/extconf.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ext/socket/extconf.rb
===================================================================
--- ruby_1_8_7/ext/socket/extconf.rb	(revision 29905)
+++ ruby_1_8_7/ext/socket/extconf.rb	(revision 29906)
@@ -140,7 +140,12 @@
   int passive, gaierr, inet4 = 0, inet6 = 0;
   struct addrinfo hints, *ai, *aitop;
   char straddr[INET6_ADDRSTRLEN], strport[16];
+#ifdef _WIN32
+  WSADATA retdata;
 
+  WSAStartup(MAKEWORD(2, 0), &retdata);
+#endif
+
   for (passive = 0; passive <= 1; passive++) {
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 29905)
+++ ruby_1_8_7/ChangeLog	(revision 29906)
@@ -1,3 +1,8 @@
+Wed Nov 24 15:44:11 2010  NAKAMURA Usaku  <usa@r...>
+
+	* ext/socket/extconf.rb (getaddrinfo): should initialize winsock on
+	  windows.
+
 Wed Nov 24 13:55:21 2010  NAKAMURA Usaku  <usa@r...>
 
 	* win32/setup.mak: use findstr.exe instead of find.exe, because all
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 29905)
+++ ruby_1_8_7/version.h	(revision 29906)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-11-24"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101124
-#define RUBY_PATCHLEVEL 322
+#define RUBY_PATCHLEVEL 323
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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