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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21300 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/process.c b/process.c
index 11c7c2314..fa593bc01 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()