archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r31344 and r31345 from trunk into ruby_1_9_2.

Browse source 
--
* win32/win32.c (kill): accept 0 as pid, fixes #4596
--
* win32/win32.c (kill): accept 0 only sig is SIGINT #4596

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-30 04:44:22 +00:00
parent c214c62840
commit 30f0aca463
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Mon Apr 25 20:53:32 2011 Tajima, Akio <artonx@yahoo.co.jp>
* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
Mon Apr 25 19:59:47 2011 Tajima, Akio <artonx@yahoo.co.jp>
* win32/win32.c (kill): accept 0 as pid, fixes #4596
Mon Apr 25 19:59:47 2011 Tajima, Akio <artonx@yahoo.co.jp> Mon Apr 25 19:59:47 2011 Tajima, Akio <artonx@yahoo.co.jp>
* win32/win32.c (kill): accept 0 as pid, fixes #4596 * win32/win32.c (kill): accept 0 as pid, fixes #4596

2
version.h
View file

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

2
win32/win32.c
View file

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