nagachika	2015-06-12 02:18:12 +0900 (Fri, 12 Jun 2015)

  New Revision: 50838

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

  Log:
    merge revision(s) 50685: [Backport #11198]
    
    * ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
      [ruby-core:69419] [Feature #11198]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/socket/ancdata.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50837)
+++ ruby_2_2/ChangeLog	(revision 50838)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Fri Jun 12 01:39:49 2015  Eric Wong  <e@8...>
+
+	* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
+	  [ruby-core:69419] [Feature #11198]
+
 Fri Jun 12 01:16:13 2015  Eric Wong  <e@8...>
 
 	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
Index: ruby_2_2/ext/socket/ancdata.c
===================================================================
--- ruby_2_2/ext/socket/ancdata.c	(revision 50837)
+++ ruby_2_2/ext/socket/ancdata.c	(revision 50838)
@@ -1135,7 +1135,7 @@ bsock_sendmsg_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/socket/ancdata.c#L1135
     struct msghdr mh;
     struct iovec iov;
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-    volatile VALUE controls_str = 0;
+    VALUE controls_str = 0;
     VALUE *controls_ptr = NULL;
     int family;
 #endif
@@ -1291,6 +1291,9 @@ bsock_sendmsg_internal(int argc, VALUE * https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/socket/ancdata.c#L1291
             rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, "sendmsg(2) would block");
 	rb_sys_fail("sendmsg(2)");
     }
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    RB_GC_GUARD(controls_str);
+#endif
 
     return SSIZET2NUM(ss);
 }
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50837)
+++ ruby_2_2/version.h	(revision 50838)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-06-12"
-#define RUBY_PATCHLEVEL 132
+#define RUBY_PATCHLEVEL 133
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 6

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50685


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