5 files changed, 17 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f39c16cca..2a2744bad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 18 13:51:22 2010  NARUSE, Yui  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* ruby.h (rb_warning, rb_sys_warning): fixed typo in rdoc.
diff --git a/eval.c b/eval.c
index 1d129a5ae9..3407548759 100644
--- a/eval.c
+++ b/eval.c
@@ -12524,7 +12524,7 @@ rb_thread_start_timer()
     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);
diff --git a/io.c b/io.c
index 9a6ddc9e5f..035f18b79a 100644
--- a/io.c
+++ b/io.c
@@ -3270,7 +3270,7 @@ retry:
     }
 
   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 @@ retry:
 		    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 @@ retry:
 	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 @@ retry:
 	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);
diff --git a/process.c b/process.c
index 9a350ff486..1ff737d54a 100644
--- a/process.c
+++ b/process.c
@@ -1331,11 +1331,11 @@ rb_f_fork(obj)
     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 @@ rb_f_system(argc, argv)
 
     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_f_system(argc, argv)
 	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) {
diff --git a/version.h b/version.h
index 1e87f8d37c..89803e6302 100644
--- a/version.h
+++ b/version.h
@@ -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[];