diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-23 03:18:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-23 03:18:56 +0000 |
commit | 82eeaadc5d2df4a7f02ed178cabcda45a2d92eab (patch) | |
tree | 5997893ab8c8550b3f0be54db9879abc0de967e3 | |
parent | 1b81dafdd5601dbfe0818b4ddc1c4a53ecd0270d (diff) |
option.c: use rb_w32_inet_pton
* ext/socket/option.c (inet_pton): use rb_w32_inet_pton, instead of
inet_ntop directly, which is unavailable on older version Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/socket/raddrinfo.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,4 +1,7 @@ -Sun Feb 23 11:54:02 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Feb 23 12:18:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/socket/option.c (inet_pton): use rb_w32_inet_pton, instead of + inet_ntop directly, which is unavailable on older version Windows. * include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a wrapper function for inet_pton minimum supported client is diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index ee494e600b..1ec03eb489 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -177,6 +177,10 @@ numeric_getaddrinfo(const char *node, const char *service, struct addrinfo **res) { #ifdef HAVE_INET_PTON +# if defined __MINGW64__ +# define inet_pton(f,s,d) rb_w32_inet_pton(f,s,d) +# endif + if (node && (!service || strspn(service, "0123456789") == strlen(service))) { static const struct { int socktype; |