diff options
| author | Tom Tromey | 2013-06-13 11:29:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-06-13 11:29:06 -0600 |
| commit | 5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da (patch) | |
| tree | af9b79246f0b18d748c3e1c33b1bb1b33cf1fbe0 /src/process.h | |
| parent | 313dfb6277b3e1ef28c7bb76e776f10168e3f0a3 (diff) | |
| parent | 94fa6ec7b306b47c251f7b8b67662598027a7ff3 (diff) | |
| download | emacs-5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da.tar.gz emacs-5ccb7e7b1ea2ca7f6e45d00d839e19f22cc961da.zip | |
merge from trunk
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 cf1e0ea1d44..38994461029 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -220,7 +220,9 @@ extern void add_read_fd (int fd, fd_callback func, void *data); | |||
| 220 | extern void delete_read_fd (int fd); | 220 | extern void delete_read_fd (int fd); |
| 221 | extern void add_write_fd (int fd, fd_callback func, void *data); | 221 | extern void add_write_fd (int fd, fd_callback func, void *data); |
| 222 | extern void delete_write_fd (int fd); | 222 | extern void delete_write_fd (int fd); |
| 223 | #ifdef NS_IMPL_GNUSTEP | ||
| 223 | extern void catch_child_signal (void); | 224 | extern void catch_child_signal (void); |
| 225 | #endif | ||
| 224 | 226 | ||
| 225 | extern void update_processes_for_thread_death (Lisp_Object); | 227 | extern void update_processes_for_thread_death (Lisp_Object); |
| 226 | 228 | ||