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/process.h | |
| 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/process.h')
| -rw-r--r-- | src/process.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/process.h b/src/process.h index 3f86e5f3945..e7ee5f9adde 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -219,6 +219,8 @@ extern void add_read_fd (int fd, fd_callback func, void *data); | |||
| 219 | extern void delete_read_fd (int fd); | 219 | extern void delete_read_fd (int fd); |
| 220 | extern void add_write_fd (int fd, fd_callback func, void *data); | 220 | extern void add_write_fd (int fd, fd_callback func, void *data); |
| 221 | extern void delete_write_fd (int fd); | 221 | extern void delete_write_fd (int fd); |
| 222 | #ifdef NS_IMPL_GNUSTEP | ||
| 222 | extern void catch_child_signal (void); | 223 | extern void catch_child_signal (void); |
| 224 | #endif | ||
| 223 | 225 | ||
| 224 | INLINE_HEADER_END | 226 | INLINE_HEADER_END |