summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-30 04:44:22 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-05-30 04:44:22 +0000
commit30f0aca4636b8a9f73d9c0e720f930787104f7e8 (patch)
tree04ab9719cf7b9cb423c6cde1914aea53383c4614 /win32
parentc214c628403c886876e659b5968d1254da3b5ebb (diff)
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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31815 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c
index d696c0f016..6d8de95b3a 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3743,7 +3743,7 @@ kill(int pid, int sig)
int ret = 0;
DWORD err;
- if (pid < 0) {
+ if (pid < 0 || pid == 0 && sig != SIGINT) {
errno = EINVAL;
return -1;
}