yugui	2011-05-30 13:44:22 +0900 (Mon, 30 May 2011)

  New Revision: 31815

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

  Log:
    merges r31344 and r31345 from trunk into ruby_1_9_2.
    --
    * win32/win32.c (kill): accept 0 as pid, fixes #4596
    --
    * win32/win32.c (kill): accept 0 only sig is SIGINT #4596

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/win32/win32.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 31814)
+++ ruby_1_9_2/ChangeLog	(revision 31815)
@@ -1,3 +1,7 @@
+Mon Apr 25 20:53:32 2011  Tajima, Akio <artonx@y...>
+
+	* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
+
 Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@y...>
 
 	* win32/win32.c (kill): accept 0 as pid, fixes #4596
@@ -2,2 +6,6 @@
 
+Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@y...>
+
+	* win32/win32.c (kill): accept 0 as pid, fixes #4596
+
 Fri Apr 22 11:49:49 2011  NARUSE, Yui  <naruse@r...>
Index: ruby_1_9_2/win32/win32.c
===================================================================
--- ruby_1_9_2/win32/win32.c	(revision 31814)
+++ ruby_1_9_2/win32/win32.c	(revision 31815)
@@ -3743,7 +3743,7 @@
     int ret = 0;
     DWORD err;
 
-    if (pid < 0) {
+    if (pid < 0 || pid == 0 && sig != SIGINT) {
 	errno = EINVAL;
 	return -1;
     }
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 31814)
+++ ruby_1_9_2/version.h	(revision 31815)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 239
+#define RUBY_PATCHLEVEL 240
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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