diff options
| author | Tom Tromey | 2013-07-06 23:18:58 -0600 |
|---|---|---|
| committer | Tom Tromey | 2013-07-06 23:18:58 -0600 |
| commit | 6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch) | |
| tree | f5f331ea361ba0f99e0f9b638d183ad492a7da31 /src/process.h | |
| parent | 0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff) | |
| parent | 219afb88d9d484393418820d1c08dc93299110ec (diff) | |
| download | emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.zip | |
merge from trunk
this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
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 38994461029..52142e55e94 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -203,6 +203,8 @@ extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; | |||
| 203 | 203 | ||
| 204 | /* Defined in callproc.c. */ | 204 | /* Defined in callproc.c. */ |
| 205 | 205 | ||
| 206 | extern void block_child_signal (void); | ||
| 207 | extern void unblock_child_signal (void); | ||
| 206 | extern void record_kill_process (struct Lisp_Process *); | 208 | extern void record_kill_process (struct Lisp_Process *); |
| 207 | 209 | ||
| 208 | /* Defined in process.c. */ | 210 | /* Defined in process.c. */ |