nobu	2014-12-05 02:09:52 +0900 (Fri, 05 Dec 2014)

  New Revision: 48709

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48709

  Log:
    socket/option.c: use rb_w32_inet_ntop
    
    * ext/socket/option.c (inet_ntop): the fallback implementaion is
      always available on Windows.

  Modified files:
    trunk/ext/socket/option.c
Index: ext/socket/option.c
===================================================================
--- ext/socket/option.c	(revision 48708)
+++ ext/socket/option.c	(revision 48709)
@@ -642,7 +642,7 @@ inspect_timeval_as_interval(int level, i https://github.com/ruby/ruby/blob/trunk/ext/socket/option.c#L642
  * 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 https://github.com/ruby/ruby/blob/trunk/ext/socket/option.c#L658
 #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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/