diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:36:48 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:36:48 +0000 |
| commit | d5aa9dc3dcf7ebe2468f103abc77b3ede1ba42e5 (patch) | |
| tree | f2cfc0593e870d54eb89bd4350baeab14e4a5330 | |
| parent | 3e3890a29fe00fa3e8cd5945a31cb490b92d0997 (diff) | |
| download | ruby-d5aa9dc3dcf7ebe2468f103abc77b3ede1ba42e5.tar.gz ruby-d5aa9dc3dcf7ebe2468f103abc77b3ede1ba42e5.tar.xz ruby-d5aa9dc3dcf7ebe2468f103abc77b3ede1ba42e5.zip | |
merges r21484 from trunk into ruby_1_9_1.
* ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h
on Windows.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/getaddrinfo.c | 1 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 1 |
3 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Jan 13 12:10:42 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/socket/{getaddrinfo,getnameinfo}.c: need to include ws2tcpip.h + on Windows. + Tue Jan 13 03:07:28 2009 NAKAMURA Usaku <usa@ruby-lang.org> * instruby.rb: require "tool/mdoc2man.rb" before chdir if needed. diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 837a506a7..de16b9fb1 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -64,6 +64,7 @@ #include <unistd.h> #else #include <winsock2.h> +#include <ws2tcpip.h> #include <io.h> #endif #include <string.h> diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index aee81b535..3ea2f7251 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -57,6 +57,7 @@ #endif #ifdef _WIN32 #include <winsock2.h> +#include <ws2tcpip.h> #define snprintf _snprintf #endif |