diff options
| author | Tom Tromey | 2013-06-03 12:25:05 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-06-03 12:25:05 -0600 |
| commit | 68359abba96d7ec4db8aab3d3dd9cf1105c3bab5 (patch) | |
| tree | 862703e7e1a1888170136a8296a5750d6b2ae2eb /src/process.h | |
| parent | cbcba8ce7f980b01c18c0fd561ef6687b1361507 (diff) | |
| parent | e2d8a6f0a229b4ebe26484b892ec4f14888f58b6 (diff) | |
| download | emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.tar.gz emacs-68359abba96d7ec4db8aab3d3dd9cf1105c3bab5.zip | |
merge from trunk; clean up some issues
Diffstat (limited to 'src/process.h')
| -rw-r--r-- | src/process.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/process.h b/src/process.h index 7d13a8e5042..cf1e0ea1d44 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -220,6 +220,7 @@ 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 | extern void catch_child_signal (void); | ||
| 223 | 224 | ||
| 224 | extern void update_processes_for_thread_death (Lisp_Object); | 225 | extern void update_processes_for_thread_death (Lisp_Object); |
| 225 | 226 | ||