[前][次][番号順一覧][スレッド一覧]

ruby-changes:9759

From: yugui <ko1@a...>
Date: Sun, 4 Jan 2009 15:15:14 +0900 (JST)
Subject: [ruby-changes:9759] Ruby:r21300 (ruby_1_9_1): merges r21248 from trunk into ruby_1_9_1.

yugui	2009-01-04 15:14:55 +0900 (Sun, 04 Jan 2009)

  New Revision: 21300

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21300

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/process.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21299)
+++ ruby_1_9_1/ChangeLog	(revision 21300)
@@ -4,6 +4,11 @@
 
 	* Makefile.in: ditto.
 
+Thu Jan  1 20:50:09 2009  URABE Shyouhei  <shyouhei@r...>
+
+	* 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@y...>
 
 	* tool/flie2lastrev.rb: supports git repositories which are cloned
Index: ruby_1_9_1/process.c
===================================================================
--- ruby_1_9_1/process.c	(revision 21299)
+++ ruby_1_9_1/process.c	(revision 21300)
@@ -973,7 +973,7 @@
 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()

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]