summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-18 04:52:27 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-18 04:52:27 +0000
commitc50494d6bb7757c8670b554118f8f40df9f6682f (patch)
tree272ea2550ec7fb1467be57976c13ae95142eb9b7 /io.c
parentae1951a030cd25bb6f3fecaf156c8bd047a91648 (diff)
* io.c, eval.c, process.c: add linux to r26371's condition.
patched by Motohiro KOSAKI [ruby-core:28151] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26972 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c8
1 files changed, 4 insertions, 4 deletions
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);