From c0144a2fbb5f5b7b90c8ab29a79653ce0a4319af Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 8 Jun 2010 09:02:21 +0000 Subject: merge revision(s) 27983: * io.c, eval.c, process.c: remove all condition of r26371. now, all platform use the same way. [Bug #3278][ruby-core:30167] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index 4a435b27c5..6f420b16ac 100644 --- a/io.c +++ b/io.c @@ -3251,9 +3251,7 @@ retry: } retry: -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_stop_timer(); -#endif switch ((pid = fork())) { case 0: /* child */ if (modef & FMODE_READABLE) { @@ -3281,17 +3279,13 @@ retry: ruby_sourcefile, ruby_sourceline, pname); _exit(127); } -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_start_timer(); -#endif rb_io_synchronized(RFILE(orig_stdout)->fptr); rb_io_synchronized(RFILE(orig_stderr)->fptr); return Qnil; case -1: /* fork failed */ -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_start_timer(); -#endif if (errno == EAGAIN) { rb_thread_sleep(1); goto retry; @@ -3312,9 +3306,7 @@ retry: break; default: /* parent */ -#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux) rb_thread_start_timer(); -#endif if (pid < 0) rb_sys_fail(pname); else { VALUE port = io_alloc(rb_cIO); -- cgit v1.2.3