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

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c707fb238..918451be27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@ Thu Jan  1 22:27:55 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* Makefile.in: ditto.
 
+Thu Jan  1 20:50:09 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* process.c (before_exec): it makes no sense for a conditional
+	  expression to return a void value.
+
 Thu Jan  1 15:08:46 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* tool/flie2lastrev.rb: supports git repositories which are cloned
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()