summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-21 17:27:56 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-21 17:27:56 +0000
commitb524523217b51e864c010646ffd5cbc4154d2fd3 (patch)
tree70844b11aaa2e3c6d67f9628e4b011a322900039 /signal.c
parent1d78315845bcc7800315acbeb6b0a804e745a257 (diff)
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/signal.c b/signal.c
index 81fb280a09..351cdc4600 100644
--- a/signal.c
+++ b/signal.c
@@ -271,9 +271,9 @@ esignal_init(argc, argv, self)
static VALUE
interrupt_init(argc, argv, self)
- int argc;
- VALUE *argv;
- VALUE self;
+ int argc;
+ VALUE *argv;
+ VALUE self;
{
VALUE args[2];
@@ -572,16 +572,17 @@ sighandler(sig)
#if defined(HAVE_NATIVETHREAD) && defined(HAVE_NATIVETHREAD_KILL)
if (!is_ruby_native_thread() && !rb_trap_accept_nativethreads[sig]) {
- sigsend_to_ruby_thread(sig);
- return;
+ sigsend_to_ruby_thread(sig);
+ return;
}
#endif
#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
if (rb_trap_accept_nativethreads[sig]) {
- ruby_nativethread_signal(sig, sighandler);
- } else {
- ruby_signal(sig, sighandler);
+ ruby_nativethread_signal(sig, sighandler);
+ }
+ else {
+ ruby_signal(sig, sighandler);
}
#endif