diff options
| author | Joakim Verona | 2010-08-27 10:58:44 +0200 |
|---|---|---|
| committer | Joakim Verona | 2010-08-27 10:58:44 +0200 |
| commit | 362120833bcbbaea94976b6701633e2ed75f6051 (patch) | |
| tree | 632690a24a934bb51a32303add5172d63b6b9e00 /src/blockinput.h | |
| parent | 1800c4865b15a9e1154bf1f03d87d1aaf750a527 (diff) | |
| parent | 1a868076f51b5d6f1cf78117463e6f9c614551ec (diff) | |
| download | emacs-362120833bcbbaea94976b6701633e2ed75f6051.tar.gz emacs-362120833bcbbaea94976b6701633e2ed75f6051.zip | |
merge from trunk, fix conflicts
Diffstat (limited to 'src/blockinput.h')
| -rw-r--r-- | src/blockinput.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/blockinput.h b/src/blockinput.h index 890adcbcd86..7ba6fc264fd 100644 --- a/src/blockinput.h +++ b/src/blockinput.h | |||
| @@ -122,8 +122,7 @@ extern int pending_atimers; | |||
| 122 | #define INPUT_BLOCKED_P (interrupt_input_blocked > 0) | 122 | #define INPUT_BLOCKED_P (interrupt_input_blocked > 0) |
| 123 | 123 | ||
| 124 | /* Defined in keyboard.c */ | 124 | /* Defined in keyboard.c */ |
| 125 | /* Don't use a prototype here; it causes trouble in some files. */ | 125 | extern void reinvoke_input_signal (void); |
| 126 | extern void reinvoke_input_signal (); | ||
| 127 | 126 | ||
| 128 | #endif /* EMACS_BLOCKINPUT_H */ | 127 | #endif /* EMACS_BLOCKINPUT_H */ |
| 129 | 128 | ||