summaryrefslogtreecommitdiff
path: root/src/syssignal.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2013-06-05 10:04:13 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2013-06-05 10:04:13 -0700
commitf019a684847950c24f5dd8ee8cfdd40d3511ba83 (patch)
tree1226d99c68968dd9b51cc0c15eba0e3c4ce670d0 /src/syssignal.h
parent28f5da6df34eb64677e25afd001c1f48b012aec7 (diff)
downloademacs-f019a684847950c24f5dd8ee8cfdd40d3511ba83.tar.gz
Chain glib's SIGCHLD handler from Emacs's (Bug#14474).
* process.c (dummy_handler): New function. (lib_child_handler): New static var. (handle_child_signal): Invoke it. (catch_child_signal): If a library has set up a signal handler, save it into lib_child_handler. (init_process_emacs): If using glib and not on Windows, tickle glib's child-handling code so that it initializes its private SIGCHLD handler. * syssignal.h (SA_SIGINFO): Default to 0. * xterm.c (x_term_init): Remove D-bus hack that I installed on May 31; it should no longer be needed now.
Diffstat (limited to 'src/syssignal.h')
-rw-r--r--src/syssignal.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/syssignal.h b/src/syssignal.h
index d7399c6cb8c..45ea8f1af3c 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -50,6 +50,10 @@ char const *safe_strsignal (int) ATTRIBUTE_CONST;
# define NSIG NSIG_MINIMUM
#endif
+#ifndef SA_SIGINFO
+# define SA_SIGINFO 0
+#endif
+
#ifndef emacs_raise
# define emacs_raise(sig) raise (sig)
#endif