usa	2014-06-27 17:55:19 +0900 (Fri, 27 Jun 2014)

  New Revision: 46583

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

  Log:
    merge revision(s) 46233: [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_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/signal.c
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 46582)
+++ ruby_2_0_0/ChangeLog	(revision 46583)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Fri Jun 27 17:54:09 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]
+
 Fri Jun 27 17:37:12 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* vsnprintf.c (BSD_vfprintf): fix string width when precision is
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 46582)
+++ ruby_2_0_0/version.h	(revision 46583)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-06-27"
-#define RUBY_PATCHLEVEL 507
+#define RUBY_PATCHLEVEL 508
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6
Index: ruby_2_0_0/signal.c
===================================================================
--- ruby_2_0_0/signal.c	(revision 46582)
+++ ruby_2_0_0/signal.c	(revision 46583)
@@ -521,7 +521,10 @@ ruby_signal(int signum, sighandler_t han https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/signal.c#L521
 	    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_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r46233


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