diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-20 22:28:18 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-20 22:28:18 +0000 |
commit | b62769eab3bf33339203c3e835baa3e23b6fdfa6 (patch) | |
tree | 4f2f6b6a4ff22093dddd14b4542f0d0ffd6a6cc6 /ext | |
parent | 6bc97ee8b15e355abc549e8e1be37b42bcb92425 (diff) |
merge revision(s) 30479:
* ext/socket/{getaddrinfo,getnameinfo}.c: include winsock2.h only when
specified to use winsock2 by user.
this problem is reported by kosaki.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@30479 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@31661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/socket/getaddrinfo.c | 4 | ||||
-rw-r--r-- | ext/socket/getnameinfo.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 9b82296dba..8381038867 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -71,7 +71,11 @@ #include <in.h> #include <netdb.h> #else +#if USE_WINSOCK2 #include <winsock2.h> +#else +#include <winsock.h> +#endif #include <io.h> #endif #include <string.h> diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index 66f7e8818a..7bbeebf7d8 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -56,7 +56,11 @@ #endif #endif #ifdef _WIN32 +#if USE_WINSOCK2 #include <winsock2.h> +#else +#include <winsock.h> +#endif #define snprintf _snprintf #endif |