usa	2015-01-14 16:08:24 +0900 (Wed, 14 Jan 2015)

  New Revision: 49247

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

  Log:
    merge revision(s) 48884,48885: [Backport #10615]
    
    * signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT,
      should be treated before calling signal(2).
      [Bug #10615]
      should be treated before calling signal(3).

  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 49246)
+++ ruby_2_0_0/ChangeLog	(revision 49247)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Jan 14 16:07:11 2015  NAKAMURA Usaku  <usa@r...>
+
+	* signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT,
+	  should be treated before calling signal(3).
+	  [Bug #10615]
+
 Wed Jan 14 15:57:26 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (exec_recursive): use the same last method name as
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 49246)
+++ ruby_2_0_0/version.h	(revision 49247)
@@ -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 "2015-01-14"
-#define RUBY_PATCHLEVEL 608
+#define RUBY_PATCHLEVEL 609
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_0_0/signal.c
===================================================================
--- ruby_2_0_0/signal.c	(revision 49246)
+++ ruby_2_0_0/signal.c	(revision 49247)
@@ -533,6 +533,17 @@ posix_signal(int signum, sighandler_t ha https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/signal.c#L533
     return ruby_signal(signum, handler);
 }
 
+#elif defined _WIN32
+static inline sighandler_t
+ruby_signal(int signum, sighandler_t handler)
+{
+    if (signum == SIGKILL) {
+	errno = EINVAL;
+	return SIG_ERR;
+    }
+    return signal(signum, handler);
+}
+
 #else /* !POSIX_SIGNAL */
 #define ruby_signal(sig,handler) (/* rb_trap_accept_nativethreads[(sig)] = 0,*/ signal((sig),(handler)))
 #if 0 /* def HAVE_NATIVETHREAD */

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48884-48885


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