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@ruby-lang.org>



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 29e21b1fb6..64b30d24fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 24 15:44:11 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/extconf.rb (getaddrinfo): should initialize winsock on
+	  windows.
+
 Wed Nov 24 13:55:21 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/setup.mak: use findstr.exe instead of find.exe, because all
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index ece615865f..2022467f14 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -140,6 +140,11 @@ main()
   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));
diff --git a/version.h b/version.h
index e65b1327cd..660d83e3ef 100644
--- a/version.h
+++ b/version.h
@@ -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