[前][次][番号順一覧][スレッド一覧]

ruby-changes:28546

From: akr <ko1@a...>
Date: Tue, 7 May 2013 12:14:56 +0900 (JST)
Subject: [ruby-changes:28546] akr:r40598 (trunk): * ext/socket/ancdata.c (ancillary_inspect): Don't call

akr	2013-05-07 12:14:47 +0900 (Tue, 07 May 2013)

  New Revision: 40598

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

  Log:
    * ext/socket/ancdata.c (ancillary_inspect): Don't call
      anc_inspect_ipv6_pktinfo if !HAVE_TYPE_STRUCT_IN6_PKTINFO.
      anc_inspect_ipv6_pktinfo is not defined in the case.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 40597)
+++ ChangeLog	(revision 40598)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue May  7 12:12:42 2013  Tanaka Akira  <akr@f...>
+
+	* ext/socket/ancdata.c (ancillary_inspect): Don't call
+	  anc_inspect_ipv6_pktinfo if !HAVE_TYPE_STRUCT_IN6_PKTINFO.
+	  anc_inspect_ipv6_pktinfo is not defined in the case.
+
 Tue May  7 12:10:52 2013  Tanaka Akira  <akr@f...>
 
 	* ext/socket/socket.c (socket_s_ip_address_list): Cast EXTRA_SPACE as
Index: ext/socket/ancdata.c
===================================================================
--- ext/socket/ancdata.c	(revision 40597)
+++ ext/socket/ancdata.c	(revision 40598)
@@ -1052,7 +1052,7 @@ ancillary_inspect(VALUE self) https://github.com/ruby/ruby/blob/trunk/ext/socket/ancdata.c#L1052
 #        if defined(IPPROTO_IPV6)
           case IPPROTO_IPV6:
             switch (type) {
-#            if defined(IPV6_PKTINFO) /* RFC 3542 */
+#            if defined(IPV6_PKTINFO) && defined(HAVE_TYPE_STRUCT_IN6_PKTINFO) /* RFC 3542 */
               case IPV6_PKTINFO: inspected = anc_inspect_ipv6_pktinfo(level, type, data, ret); break;
 #            endif
             }

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

[前][次][番号順一覧][スレッド一覧]