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

ruby-changes:14594

From: naruse <ko1@a...>
Date: Wed, 27 Jan 2010 14:12:58 +0900 (JST)
Subject: [ruby-changes:14594] Ruby:r26437 (ruby_1_8): * io.c, eval.c, process.c: add __APPLE__ to r26371's condition.

naruse	2010-01-27 14:11:17 +0900 (Wed, 27 Jan 2010)

  New Revision: 26437

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

  Log:
    * io.c, eval.c, process.c: add __APPLE__ to r26371's condition.
      patched by Wataru Kimura [ruby-dev:40145]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/eval.c
    branches/ruby_1_8/io.c
    branches/ruby_1_8/process.c

Index: ruby_1_8/process.c
===================================================================
--- ruby_1_8/process.c	(revision 26436)
+++ ruby_1_8/process.c	(revision 26437)
@@ -1331,11 +1331,11 @@
     fflush(stderr);
 #endif
 
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
     before_exec();
 #endif
     pid = fork();
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
     after_exec();
 #endif
     switch (pid) {
@@ -1578,7 +1578,7 @@
 
     chfunc = signal(SIGCHLD, SIG_DFL);
   retry:
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
     before_exec();
 #endif
     pid = fork();
@@ -1588,7 +1588,7 @@
 	rb_protect(proc_exec_args, (VALUE)&earg, NULL);
 	_exit(127);
     }
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
     after_exec();
 #endif
     if (pid < 0) {
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26436)
+++ ruby_1_8/ChangeLog	(revision 26437)
@@ -1,7 +1,12 @@
+Wed Jan 27 14:05:46 2010  NARUSE, Yui  <naruse@r...>
+
+	* io.c, eval.c, process.c: add __APPLE__ to r26371's condition.
+	  patched by Wataru Kimura [ruby-dev:40145]
+
 Tue Jan 26 20:24:04 2010  Masatoshi SEKI  <m_seki@m...>
 
 	* lib/drb/eq.rb: fix circular requrie in drb.
-          reported by akr. see [ruby-dev:40156] [ruby-core:27661]
+	  reported by akr. see [ruby-dev:40156] [ruby-core:27661]
 
 Tue Jan 26 20:13:27 2010  NARUSE, Yui  <naruse@r...>
 
Index: ruby_1_8/io.c
===================================================================
--- ruby_1_8/io.c	(revision 26436)
+++ ruby_1_8/io.c	(revision 26437)
@@ -3267,7 +3267,7 @@
     }
 
   retry:
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
     rb_thread_stop_timer();
 #endif
     switch ((pid = fork())) {
@@ -3297,7 +3297,7 @@
 		    ruby_sourcefile, ruby_sourceline, pname);
 	    _exit(127);
 	}
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
 	rb_thread_start_timer();
 #endif
 	rb_io_synchronized(RFILE(orig_stdout)->fptr);
@@ -3305,7 +3305,7 @@
 	return Qnil;
 
       case -1:			/* fork failed */
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
 	rb_thread_start_timer();
 #endif
 	if (errno == EAGAIN) {
@@ -3328,7 +3328,7 @@
 	break;
 
       default:			/* parent */
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined(__APPLE__)
 	rb_thread_start_timer();
 #endif
 	if (pid < 0) rb_sys_fail(pname);
Index: ruby_1_8/eval.c
===================================================================
--- ruby_1_8/eval.c	(revision 26436)
+++ ruby_1_8/eval.c	(revision 26437)
@@ -12520,7 +12520,7 @@
     safe_mutex_lock(&time_thread.lock);
     if (pthread_create(&time_thread.thread, 0, thread_timer, args) == 0) {
 	thread_init = 1;
-#ifndef __NetBSD__
+#if !defined(__NetBSD__) && !defined(__APPLE__)
 	pthread_atfork(0, 0, rb_thread_stop_timer);
 #endif
 	pthread_cond_wait(&start, &time_thread.lock);

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

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