Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge revision(s) 29901:

?\012
	* 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@29906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit d49ee05be599ef9d8bf0eff189ce6b2175ad0f7c 1 parent cf231fd
@shyouhei shyouhei authored
Showing with 11 additions and 1 deletion.
  1. +5 −0 ChangeLog
  2. +5 −0 ext/socket/extconf.rb
  3. +1 −1  version.h
View
5 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
View
5 ext/socket/extconf.rb
@@ -140,6 +140,11 @@ def %(s) s || self end
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));
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.