From 893be375be8be249d2a188298260573c4034624b Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 4 Jan 2009 06:14:55 +0000 Subject: merges r21248 from trunk into ruby_1_9_1. * process.c (before_exec): it makes no sense for a conditional expression to return a void value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'process.c') diff --git a/process.c b/process.c index 11c7c23144..fa593bc013 100644 --- a/process.c +++ b/process.c @@ -973,7 +973,7 @@ void rb_thread_reset_timer_thread(void); static int forked_child = 0; #define before_exec() \ - (rb_enable_interrupt(), forked_child ? 0 : rb_thread_stop_timer_thread()) + (rb_enable_interrupt(), (forked_child ? 0 : (rb_thread_stop_timer_thread(), 1))) #define after_exec() \ (rb_thread_reset_timer_thread(), rb_thread_start_timer_thread(), forked_child = 0, rb_disable_interrupt()) #define before_fork() before_exec() -- cgit v1.2.3