diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/process.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e79bcb7080a..62656d06354 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-11-02 Andreas Schwab <schwab@linux-m68k.org> + + * process.c (catch_child_signal): Fix incorrect assertion. + 2014-11-01 Jan Djärv <jan.h.d@swipnet.se> * macfont.m (macfont_draw): diff --git a/src/process.c b/src/process.c index 06fc918cf54..6eae5166465 100644 --- a/src/process.c +++ b/src/process.c @@ -7092,7 +7092,8 @@ catch_child_signal (void) emacs_sigaction_init (&action, deliver_child_signal); block_child_signal (&oldset); sigaction (SIGCHLD, &action, &old_action); - eassert (! (old_action.sa_flags & SA_SIGINFO)); + eassert (old_action.sa_handler == SIG_DFL || old_action.sa_handler == SIG_IGN + || ! (old_action.sa_flags & SA_SIGINFO)); if (old_action.sa_handler != deliver_child_signal) lib_child_handler |