naruse	2013-05-12 16:09:26 +0900 (Sun, 12 May 2013)

  New Revision: 40654

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

  Log:
    * ext/socket/rubysocket.h (rsock_inspect_sockaddr): as r40646
      check HAVE_TYPE_STRUCT_SOCKADDR_DL.

  Modified files:
    trunk/ChangeLog
    trunk/ext/socket/raddrinfo.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40653)
+++ ChangeLog	(revision 40654)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun May 12 16:06:43 2013  NARUSE, Yui  <naruse@r...>
+
+	* ext/socket/rubysocket.h (rsock_inspect_sockaddr): as r40646
+	  check HAVE_TYPE_STRUCT_SOCKADDR_DL.
+
 Sat May 11 23:01:58 2013  NARUSE, Yui  <naruse@r...>
 
 	* ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL):
Index: ext/socket/raddrinfo.c
===================================================================
--- ext/socket/raddrinfo.c	(revision 40653)
+++ ext/socket/raddrinfo.c	(revision 40654)
@@ -1159,7 +1159,7 @@ rsock_inspect_sockaddr(struct sockaddr * https://github.com/ruby/ruby/blob/trunk/ext/socket/raddrinfo.c#L1159
           }
 #endif
 
-#ifdef AF_LINK
+#if defined(AF_LINK) && defined(HAVE_TYPE_STRUCT_SOCKADDR_DL)
 	  /* AF_LINK is defined in 4.4BSD derivations since Net2.
 	     link_ntoa is also defined at Net2.
              However Debian GNU/kFreeBSD defines AF_LINK but

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