diff options
| author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 07:38:37 +0000 |
|---|---|---|
| committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-24 07:38:37 +0000 |
| commit | 23a810e37959b299b7f51b66730529d622b0b27b (patch) | |
| tree | 81ba7e7fca5ca68fee5ebf776338e3db5bec4312 /ext | |
| parent | 54576f9d146d3ce45a3a2af9a6ef484829910012 (diff) | |
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
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/socket/extconf.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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)); |