summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/signal.cc
diff options
context:
space:
mode:
Diffstat (limited to 'winsup/cygwin/signal.cc')
-rw-r--r--winsup/cygwin/signal.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc
index 54232bb45..b0ac94a79 100644
--- a/winsup/cygwin/signal.cc
+++ b/winsup/cygwin/signal.cc
@@ -93,7 +93,7 @@ nanosleep (const struct timespec *rqtp, struct timespec *rmtp)
rem = 0;
if (rc == WAIT_OBJECT_0)
{
- (void) call_signal_handler_now ();
+ (void) _my_tls.call_signal_handler ();
set_errno (EINTR);
res = -1;
}
@@ -302,7 +302,7 @@ kill_pgrp (pid_t pid, siginfo_t& si)
found++;
}
- if (killself && kill_worker (myself->pid, si))
+ if (killself && !exit_state && kill_worker (myself->pid, si))
res = -1;
if (!found)
@@ -341,7 +341,7 @@ abort (void)
set_signal_mask (sig_mask);
raise (SIGABRT);
- (void) call_signal_handler_now (); /* Call any signal handler */
+ (void) _my_tls.call_signal_handler (); /* Call any signal handler */
do_exit (1); /* signal handler didn't exit. Goodbye. */
}