akr	2014-09-03 19:23:24 +0900 (Wed, 03 Sep 2014)

  New Revision: 47374

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

  Log:
    * process.c (before_fork_ruby): Renamed from before_fork.
      (after_fork_ruby): Renamed from after_fork.

  Modified files:
    trunk/ChangeLog
    trunk/process.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47373)
+++ ChangeLog	(revision 47374)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Sep  3 19:10:28 2014  Tanaka Akira  <akr@f...>
+
+	* process.c (before_fork_ruby): Renamed from before_fork.
+	  (after_fork_ruby): Renamed from after_fork.
+
 Wed Sep  3 18:56:05 2014  Tanaka Akira  <akr@f...>
 
 	* process.c (forked_child): Removed.
Index: process.c
===================================================================
--- process.c	(revision 47373)
+++ process.c	(revision 47374)
@@ -1163,8 +1163,8 @@ after_exec(void) https://github.com/ruby/ruby/blob/trunk/process.c#L1163
     after_exec_non_async_signal_safe();
 }
 
-#define before_fork() before_exec()
-#define after_fork() (rb_threadptr_pending_interrupt_clear(GET_THREAD()), after_exec())
+#define before_fork_ruby() before_exec()
+#define after_fork_ruby() (rb_threadptr_pending_interrupt_clear(GET_THREAD()), after_exec())
 
 #include "dln.h"
 
@@ -3355,11 +3355,11 @@ retry_fork_ruby(int *status) https://github.com/ruby/ruby/blob/trunk/process.c#L3355
 
     while (1) {
         prefork();
-        before_fork();
+        before_fork_ruby();
         pid = fork();
         if (pid == 0) /* fork succeed, child process */
             return pid;
-        preserving_errno(after_fork());
+        preserving_errno(after_fork_ruby());
         if (0 < pid) /* fork succeed, parent process */
             return pid;
         /* fork failed */
@@ -3379,7 +3379,7 @@ rb_fork_ruby(int *status) https://github.com/ruby/ruby/blob/trunk/process.c#L3379
     if (pid < 0)
         return pid;
     if (!pid) {
-        after_fork();
+        after_fork_ruby();
     }
     return pid;
 }
@@ -5717,9 +5717,9 @@ rb_daemon(int nochdir, int noclose) https://github.com/ruby/ruby/blob/trunk/process.c#L5717
 {
     int err = 0;
 #ifdef HAVE_DAEMON
-    before_fork();
+    before_fork_ruby();
     err = daemon(nochdir, noclose);
-    after_fork();
+    after_fork_ruby();
     rb_thread_atfork();
 #else
     int n;

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