From 72a943aa47b922f8bd2b4348e85928fdf675fa5b Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 29 Jun 2008 07:52:47 +0000 Subject: merge revision(s) 16507: * eval.c (search_method, remove_method, error_print, rb_alias) (rb_eval, rb_rescue2, search_required, Init_eval, rb_thread_create), gc.c (rb_source_filename, Init_stack), io.c (rb_io_getline), parse.y (rb_id2name, rb_parser_free): suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17646 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'signal.c') diff --git a/signal.c b/signal.c index 115ee99c59..b6cad9dc84 100644 --- a/signal.c +++ b/signal.c @@ -569,16 +569,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 -- cgit v1.2.3