merges r21484 from trunk into ruby_1_9_1. * ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h on Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merges r21484 from trunk into ruby_1_9_1.
* ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
on Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e