diff options
| author | Joakim Verona | 2013-07-02 22:46:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-07-02 22:46:17 +0200 |
| commit | 3718127221fbbc31f8ebd027ab7c95403dbe9118 (patch) | |
| tree | ef422898f3344c8f94f6ecf63eb583122bbf2bd8 /src/process.h | |
| parent | 1ce45b902c67b8a0dda8d71bd2812de29a9988a6 (diff) | |
| parent | a3b49114c186d84404226af75ae7905bd1cd018f (diff) | |
| download | emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.tar.gz emacs-3718127221fbbc31f8ebd027ab7c95403dbe9118.zip | |
Merge branch 'trunk' into xwidget
Conflicts:
src/window.c
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 0c4e17e68cf..e7ee5f9adde 100644 --- a/src/process.h +++ b/src/process.h | |||
| @@ -200,6 +200,8 @@ extern Lisp_Object QCflowcontrol, Qhw, Qsw, QCsummary; | |||
| 200 | 200 | ||
| 201 | /* Defined in callproc.c. */ | 201 | /* Defined in callproc.c. */ |
| 202 | 202 | ||
| 203 | extern void block_child_signal (void); | ||
| 204 | extern void unblock_child_signal (void); | ||
| 203 | extern void record_kill_process (struct Lisp_Process *); | 205 | extern void record_kill_process (struct Lisp_Process *); |
| 204 | 206 | ||
| 205 | /* Defined in process.c. */ | 207 | /* Defined in process.c. */ |