summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-01 11:53:21 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-01 11:53:21 +0000
commitb9cd44cfc1dc9d2c62fa05a1ffef5baab03cc25c (patch)
treeb9d439db449a2e86d38533c98eebf6d58210f021
parente485a566ed8d5d8670641909319161632f9647c9 (diff)
* 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/trunk@21248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--process.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3065786261..01d7960a41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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 20:47:09 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (sock_s_getaddrinfo): use family_to_int.
diff --git a/process.c b/process.c
index ac0ec0605e..ed84d516aa 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()