From b5b5b28c650fc51cba7c06b48501de84c0ef9523 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 18 Aug 2018 12:35:28 +0000
Subject: [PATCH] Temporary revert "process.c: dead code when no SIGCHLD"

This reverts commit r64407.
Maybe it breaks http://mswinci.japaneast.cloudapp.azure.com/vc12-x64/ruby-trunk/log/20180817T095734Z.fail.html.gz

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64447 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 process.c | 18 ++++++------------
 signal.c  |  6 +-----
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/process.c b/process.c
index 26db04a4fb..a58f7ad39f 100644
--- a/process.c
+++ b/process.c
@@ -981,7 +981,6 @@ rb_sigwait_fd_migrate(rb_vm_t *vm)
     rb_native_mutex_unlock(&vm->waitpid_lock);
 }
 
-#if RUBY_SIGCHLD
 static void
 waitpid_notify(struct waitpid_state *w, rb_pid_t ret)
 {
@@ -995,7 +994,13 @@ waitpid_notify(struct waitpid_state *w, rb_pid_t ret)
     }
 }
 
+#ifdef _WIN32 /* for spawnvp result from mjit.c */
+#  define waitpid_sys(pid,status,options) \
+	  (WaitForSingleObject((HANDLE)(pid), 0),\
+	   GetExitCodeProcess((HANDLE)(pid), (LPDWORD)(status)))
+#else
 #  define waitpid_sys(pid,status,options) do_waitpid((pid),(status),(options))
+#endif
 
 extern volatile unsigned int ruby_nocldwait; /* signal.c */
 /* called by timer thread or thread which acquired sigwait_fd */
@@ -1027,14 +1032,10 @@ waitpid_each(struct list_head *head)
         }
     }
 }
-#else
-# define ruby_nocldwait 0
-#endif
 
 void
 ruby_waitpid_all(rb_vm_t *vm)
 {
-#if RUBY_SIGCHLD
     rb_native_mutex_lock(&vm->waitpid_lock);
     waitpid_each(&vm->waiting_pids);
     if (list_empty(&vm->waiting_pids)) {
@@ -1046,7 +1047,6 @@ ruby_waitpid_all(rb_vm_t *vm)
             ; /* keep looping */
     }
     rb_native_mutex_unlock(&vm->waitpid_lock);
-#endif
 }
 
 static void
@@ -4458,27 +4458,21 @@ rb_f_system(int argc, VALUE *argv)
 
     execarg_obj = rb_execarg_new(argc, argv, TRUE, TRUE);
     TypedData_Get_Struct(execarg_obj, struct rb_execarg, &exec_arg_data_type, eargp);
-#if RUBY_SIGCHLD
     eargp->nocldwait_prev = ruby_nocldwait;
     ruby_nocldwait = 0;
-#endif
     pid = rb_execarg_spawn(execarg_obj, NULL, 0);
 #if defined(HAVE_WORKING_FORK) || defined(HAVE_SPAWNV)
     if (pid > 0) {
         int ret, status;
         ret = rb_waitpid(pid, &status, 0);
         if (ret == (rb_pid_t)-1) {
-# if RUBY_SIGCHLD
             ruby_nocldwait = eargp->nocldwait_prev;
-# endif
             RB_GC_GUARD(execarg_obj);
             rb_sys_fail("Another thread waited the process started by system().");
         }
     }
 #endif
-#if RUBY_SIGCHLD
     ruby_nocldwait = eargp->nocldwait_prev;
-#endif
     if (pid < 0) {
         if (eargp->exception) {
             int err = errno;
diff --git a/signal.c b/signal.c
index 326179f383..013425bfb6 100644
--- a/signal.c
+++ b/signal.c
@@ -531,9 +531,7 @@ static struct {
     rb_atomic_t cnt[RUBY_NSIG];
     rb_atomic_t size;
 } signal_buff;
-#if RUBY_SIGCHLD
 volatile unsigned int ruby_nocldwait;
-#endif
 
 #ifdef __dietlibc__
 #define sighandler_t sh_t
@@ -617,8 +615,7 @@ ruby_signal(int signum, sighandler_t handler)
 #endif
 
     switch (signum) {
-#if RUBY_SIGCHLD
-      case RUBY_SIGCHLD:
+      case SIGCHLD:
 	if (handler == SIG_IGN) {
 	    ruby_nocldwait = 1;
 	    if (sigact.sa_flags & SA_SIGINFO) {
@@ -632,7 +629,6 @@ ruby_signal(int signum, sighandler_t handler)
 	    ruby_nocldwait = 0;
 	}
 	break;
-#endif
 #if defined(SA_ONSTACK) && defined(USE_SIGALTSTACK)
       case SIGSEGV:
 #ifdef SIGBUS