From c2fb27ac4a5b62571136489918a9c99bb17c821a Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 5 Dec 2014 08:09:12 +0000 Subject: [PATCH] socket/option.c: fix inet_ntop link error on mswin * ext/socket/option.c (inet_ntop): link aliased inet_ntop in libruby on mswin not rb_w32_inet_ntop which fails to link for unknown reason. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48714 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/socket/option.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f83304f551..8217e5874e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Dec 5 17:09:09 2014 Nobuyoshi Nakada + + * ext/socket/option.c (inet_ntop): link aliased inet_ntop in + libruby on mswin not rb_w32_inet_ntop which fails to link for + unknown reason. + Fri Dec 5 11:09:54 2014 Eric Wong * iseq.c (prepare_iseq_build): remove unused block_opt param diff --git a/ext/socket/option.c b/ext/socket/option.c index 2c4e77b673..98f0ddc3b0 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -658,8 +658,10 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len) #endif return numaddr; } -#elif defined _WIN32 +#elif defined __MINGW32__ # define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l) +#elif defined _MSC_VER && RUBY_MSVCRT_VERSION < 90 +const char *WSAAPI inet_ntop(int, const void *, char *, size_t); #endif /* Although the buffer size needed depends on the prefixes, "%u" may generate "4294967295". */