shyouhei	2010-06-08 18:02:21 +0900 (Tue, 08 Jun 2010)

  New Revision: 28222

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

  Log:
    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]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/eval.c
    branches/ruby_1_8_7/io.c
    branches/ruby_1_8_7/process.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/process.c
===================================================================
--- ruby_1_8_7/process.c	(revision 28221)
+++ ruby_1_8_7/process.c	(revision 28222)
@@ -1330,13 +1330,10 @@
     fflush(stderr);
 #endif
 
-#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     before_exec();
-#endif
     pid = fork();
-#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     after_exec();
-#endif
+
     switch (pid) {
       case 0:
 #ifdef linux
@@ -1577,9 +1574,7 @@
 
     chfunc = signal(SIGCHLD, SIG_DFL);
   retry:
-#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     before_exec();
-#endif
     pid = fork();
     if (pid == 0) {
 	/* child process */
@@ -1587,9 +1582,7 @@
 	rb_protect(proc_exec_args, (VALUE)&earg, NULL);
 	_exit(127);
     }
-#if defined(__NetBSD__) || defined(__APPLE__) || defined(linux)
     after_exec();
-#endif
     if (pid < 0) {
 	if (errno == EAGAIN) {
 	    rb_thread_sleep(1);
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 28221)
+++ ruby_1_8_7/ChangeLog	(revision 28222)
@@ -1,3 +1,8 @@
+Tue Jun  8 17:49:18 2010  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* io.c, eval.c, process.c: remove all condition of r26371.
+	  now, all platform use the same way. [Bug #3278][ruby-core:30167]
+
 Tue Jun  8 17:45:36 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 28221)
+++ ruby_1_8_7/version.h	(revision 28222)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 286
+#define RUBY_PATCHLEVEL 287
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/io.c
===================================================================
--- ruby_1_8_7/io.c	(revision 28221)
+++ ruby_1_8_7/io.c	(revision 28222)
@@ -3251,9 +3251,7 @@
     }
 
   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 @@
 		    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 @@
 	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);
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 28221)
+++ ruby_1_8_7/eval.c	(revision 28222)
@@ -12352,9 +12352,6 @@
     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__) && !defined(linux)
-	pthread_atfork(0, 0, rb_thread_stop_timer);
-#endif
 	pthread_cond_wait(&start, &time_thread.lock);
     }
     pthread_cleanup_pop(1);

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