diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-04 17:09:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-04 17:09:52 +0000 |
| commit | 10cd530e4098d693383168d0892551ea2585b0f9 (patch) | |
| tree | 60f78a612cfedfe99e9773aaeb2b39dcf568de68 /ext/socket/option.c | |
| parent | bc0f131277af6b6cd65a5e75c3b8a2d9d8b073ad (diff) | |
socket/option.c: use rb_w32_inet_ntop
* ext/socket/option.c (inet_ntop): the fallback implementaion is
always available on Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/option.c')
| -rw-r--r-- | ext/socket/option.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c index a4a2a37c0f..2c4e77b673 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -642,7 +642,7 @@ inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret) * it is not distinguishable by the size. */ -#ifndef HAVE_INET_NTOP +#if !defined HAVE_INET_NTOP && ! defined _WIN32 static const char * inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len) { @@ -658,7 +658,7 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len) #endif return numaddr; } -#elif defined __MINGW64__ +#elif defined _WIN32 # define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l) #endif |