Mercurial > emacs
changeset 111545:a112abc60888
* src/keyboard.c (pending_malloc_warning): Add const to match
definition in alloc.c.
(Fset_input_interrupt_mode): Simplify #ifdefs.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 14 Nov 2010 22:18:50 -0800 |
| parents | 107fd4b37e9d |
| children | 32e6d2b445ce |
| files | src/ChangeLog src/keyboard.c |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 14 22:10:35 2010 -0800 +++ b/src/ChangeLog Sun Nov 14 22:18:50 2010 -0800 @@ -1,3 +1,9 @@ +2010-11-15 Dan Nicolaescu <dann@ics.uci.edu> + + * keyboard.c (pending_malloc_warning): Add const to match + definition in alloc.c. + (Fset_input_interrupt_mode): Simplify #ifdefs. + 2010-11-15 Dan Nicolaescu <dann@ics.uci.edu> Clean up systty.h macros.
--- a/src/keyboard.c Sun Nov 14 22:10:35 2010 -0800 +++ b/src/keyboard.c Sun Nov 14 22:18:50 2010 -0800 @@ -431,7 +431,7 @@ /* Nonzero if input is available. */ int input_pending; -extern char *pending_malloc_warning; +extern const char *pending_malloc_warning; /* Circular buffer for pre-read keyboard input. */ @@ -11100,10 +11100,10 @@ #ifndef DOS_NT /* this causes startup screen to be restored and messes with the mouse */ reset_all_sys_modes (); -#endif interrupt_input = new_interrupt_input; -#ifndef DOS_NT init_all_sys_modes (); +#else + interrupt_input = new_interrupt_input; #endif #ifdef POLL_FOR_INPUT