merges r31344 from trunk into ruby_1_9_2.

--
* win32/win32.c (kill): accept 0 as pid, fixes #4596

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-30 04:44:13 +00:00
parent 43be6769f1
commit c214c62840
3 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
Mon Apr 25 19:59:47 2011 Tajima, Akio <artonx@yahoo.co.jp>
* win32/win32.c (kill): accept 0 as pid, fixes #4596
Fri Apr 22 11:49:49 2011 NARUSE, Yui <naruse@ruby-lang.org>
* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):

View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 238
#define RUBY_PATCHLEVEL 239
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1

View file

@ -3743,7 +3743,7 @@ kill(int pid, int sig)
int ret = 0;
DWORD err;
if (pid <= 0) {
if (pid < 0) {
errno = EINVAL;
return -1;
}