procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix incorrect assertion

Browse source 
* process.c (catch_child_signal): Fix incorrect assertion.
This commit is contained in:
Andreas Schwab 2014-11-02 18:02:32 +01:00
parent fce9e55323
commit f26d02a625
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -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):

3
src/process.c
View file

@ -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