[Emacs-diffs] trunk r118255: Fix incorrect assertion

[Andreas Schwab]

------------------------------------------------------------
revno: 118255
revision-id: address@hidden
parent: address@hidden
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sun 2014-11-02 18:02:32 +0100
message:
  Fix incorrect assertion
  
  * process.c (catch_child_signal): Fix incorrect assertion.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/process.c                  process.c-20091113204419-o5vbwnq5f7feedwu-462

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-11-01 20:06:49 +0000
+++ b/src/ChangeLog     2014-11-02 17:02:32 +0000
@@ -1,3 +1,7 @@
+2014-11-02  Andreas Schwab  <address@hidden>
+
+       * process.c (catch_child_signal): Fix incorrect assertion.
+
 2014-11-01  Jan Djärv  <address@hidden>
 
        * macfont.m (macfont_draw):

=== modified file 'src/process.c'
--- a/src/process.c     2014-10-12 22:56:45 +0000
+++ b/src/process.c     2014-11-02 17:02:32 +0000
@@ -7092,7 +7092,8 @@
   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