diff options
| author | Paul Eggert | 2013-06-27 07:47:52 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-06-27 07:47:52 -0700 |
| commit | dae2f5ef41cd81c4feeddb3667c03d1f27df7743 (patch) | |
| tree | b60602ea129e7ed6b7bd43f12d2a1d5db72ac027 /src/callproc.c | |
| parent | 79f38c4eee230ca8d888e6babf98d5a1ad9bcb5f (diff) | |
| download | emacs-dae2f5ef41cd81c4feeddb3667c03d1f27df7743.tar.gz emacs-dae2f5ef41cd81c4feeddb3667c03d1f27df7743.zip | |
Do not tickle glib SIGCHLD handling if Cygwin.
This mostly consists of undoing recent changes.
* callproc.c (Fcall_process):
* process.c (create_process):
Do not worry about catching SIGCHLD here, undoing previous change.
* nsterm.m (ns_term_init): Re-catch SIGCHLD, undoing previous change.
* process.c, process.h (catch_child_signal):
No longer extern if !NS_IMPL_GNUSTEP, undoing 06-22 change.
* process.c (catch_child_handler): Don't worry about being called
lazily and do not assume caller has blocked SIGCHLD, undoing
previous change. Move first-time stuff back to
init_process_emacs, undoing 06-22 change. If CYGWIN, do not
tickle glib, as that causes Cygwin bootstrap to fail. Do not
set lib_child_handler if it's already initialized, which may
help avoid problems on GNUStep.
Diffstat (limited to 'src/callproc.c')
| -rw-r--r-- | src/callproc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/callproc.c b/src/callproc.c index 7db984fa71c..f0aa8222342 100644 --- a/src/callproc.c +++ b/src/callproc.c | |||
| @@ -613,7 +613,6 @@ usage: (call-process PROGRAM &optional INFILE DESTINATION DISPLAY &rest ARGS) * | |||
| 613 | 613 | ||
| 614 | block_input (); | 614 | block_input (); |
| 615 | block_child_signal (); | 615 | block_child_signal (); |
| 616 | catch_child_signal (); | ||
| 617 | 616 | ||
| 618 | #ifdef WINDOWSNT | 617 | #ifdef WINDOWSNT |
| 619 | pid = child_setup (filefd, fd1, fd_error, new_argv, 0, current_dir); | 618 | pid = child_setup (filefd, fd1, fd_error, new_argv, 0, current_dir); |