naruse	2010-03-18 13:52:27 +0900 (Thu, 18 Mar 2010)

  New Revision: 26972

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

  Log:
    * io.c, eval.c, process.c: add linux to r26371's condition.
      patched by Motohiro KOSAKI [ruby-core:28151]

  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
    branches/ruby_1_8/version.h

Index: ruby_1_8/process.c
===================================================================
--- ruby_1_8/process.c	(revision 26971)
+++ ruby_1_8/process.c	(revision 26972)
@@ -1331,11 +1331,11 @@
     fflush(stderr);
 #endif
 
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     before_exec();
 #endif
     pid = fork();
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     after_exec();
 #endif
     switch (pid) {
@@ -1578,7 +1578,7 @@
 
     chfunc = signal(SIGCHLD, SIG_DFL);
   retry:
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     before_exec();
 #endif
     pid = fork();
@@ -1588,7 +1588,7 @@
 	rb_protect(proc_exec_args, (VALUE)&earg, NULL);
 	_exit(127);
     }
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     after_exec();
 #endif
     if (pid < 0) {
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 26971)
+++ ruby_1_8/ChangeLog	(revision 26972)
@@ -1,3 +1,8 @@
+Thu Mar 18 13:51:22 2010  NARUSE, Yui  <naruse@r...>
+
+	* io.c, eval.c, process.c: add linux to r26371's condition.
+	  patched by Motohiro KOSAKI [ruby-core:28151]
+
 Wed Mar 17 06:39:59 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.h (rb_warning, rb_sys_warning): fixed typo in rdoc.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 26971)
+++ ruby_1_8/version.h	(revision 26972)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-03-17"
+#define RUBY_RELEASE_DATE "2010-03-18"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100317
+#define RUBY_RELEASE_CODE 20100318
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 18
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/io.c
===================================================================
--- ruby_1_8/io.c	(revision 26971)
+++ ruby_1_8/io.c	(revision 26972)
@@ -3270,7 +3270,7 @@
     }
 
   retry:
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     rb_thread_stop_timer();
 #endif
     switch ((pid = fork())) {
@@ -3300,7 +3300,7 @@
 		    ruby_sourcefile, ruby_sourceline, pname);
 	    _exit(127);
 	}
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
 	rb_thread_start_timer();
 #endif
 	rb_io_synchronized(RFILE(orig_stdout)->fptr);
@@ -3308,7 +3308,7 @@
 	return Qnil;
 
       case -1:			/* fork failed */
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
 	rb_thread_start_timer();
 #endif
 	if (errno == EAGAIN) {
@@ -3331,7 +3331,7 @@
 	break;
 
       default:			/* parent */
-#if defined(__NetBSD__) || defined(__APPLE__)
+#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
 	rb_thread_start_timer();
 #endif
 	if (pid < 0) rb_sys_fail(pname);
Index: ruby_1_8/eval.c
===================================================================
--- ruby_1_8/eval.c	(revision 26971)
+++ ruby_1_8/eval.c	(revision 26972)
@@ -12524,7 +12524,7 @@
     safe_mutex_lock(&time_thread.lock);
     if (pthread_create(&time_thread.thread, 0, thread_timer, args) == 0) {
 	thread_init = 1;
-#if !defined(__NetBSD__) && !defined(__APPLE__)
+#if !defined(__NetBSD__) && !defined(__APPLE__) && !defined(linux)
 	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/