nagachika	2014-06-30 02:56:19 +0900 (Mon, 30 Jun 2014)

  New Revision: 46616

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

  Log:
    merge revision(s) r46233: [Backport #9878]
    
    * signal.c (ruby_signal): should return either `old.sa_sigaction`
      or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in
      `old.sa_flags`, because they may not be a union.
      [ruby-core:62836] [Bug #9878]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/signal.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46615)
+++ ruby_2_1/ChangeLog	(revision 46616)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Jun 30 02:46:44 2014  Rei Odaira  <Rei.Odaira@g...>
+
+	* signal.c (ruby_signal): should return either `old.sa_sigaction`
+	  or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in
+	  `old.sa_flags`, because they may not be a union.
+	  [ruby-core:62836] [Bug #9878]
+
 Mon Jun 30 02:36:08 2014  Eric Wong  <e@8...>
 
 	* process.c (proc_getgroups, proc_setgroups): use ALLOCV_N
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46615)
+++ ruby_2_1/version.h	(revision 46616)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-06-30"
-#define RUBY_PATCHLEVEL 153
+#define RUBY_PATCHLEVEL 154
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_1/signal.c
===================================================================
--- ruby_2_1/signal.c	(revision 46615)
+++ ruby_2_1/signal.c	(revision 46616)
@@ -543,7 +543,10 @@ ruby_signal(int signum, sighandler_t han https://github.com/ruby/ruby/blob/trunk/ruby_2_1/signal.c#L543
 	    rb_bug_errno("sigaction", errno);
 	}
     }
-    return old.sa_handler;
+    if (old.sa_flags & SA_SIGINFO)
+	return (sighandler_t)old.sa_sigaction;
+    else
+	return old.sa_handler;
 }
 
 sighandler_t

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46233


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