aboutsummaryrefslogtreecommitdiffstats
path: root/signal.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-18 12:35:28 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-18 12:35:28 +0000
commitb5b5b28c650fc51cba7c06b48501de84c0ef9523 (patch)
tree663cb1775809cf3deaec6b6278680d8ed0a11e82 /signal.c
parent3e1a6feeb636a37bc671461eb341dff97eb4b82b (diff)
downloadruby-b5b5b28c650fc51cba7c06b48501de84c0ef9523.tar.gz
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
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c6
1 files changed, 1 insertions, 5 deletions
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