[Emacs-diffs] /srv/bzr/emacs/trunk r102392: * src/keyboard.c (pending_malloc_warning): Add const to match

[Dan Nicolaescu]

------------------------------------------------------------
revno: 102392
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-11-14 22:18:50 -0800
message:
  * src/keyboard.c (pending_malloc_warning): Add const to match
  definition in alloc.c.
  (Fset_input_interrupt_mode): Simplify #ifdefs.
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-11-15 06:10:35 +0000
+++ b/src/ChangeLog     2010-11-15 06:18:50 +0000
@@ -1,5 +1,11 @@
 2010-11-15  Dan Nicolaescu  <address@hidden>
 
+       * keyboard.c (pending_malloc_warning): Add const to match
+       definition in alloc.c.
+       (Fset_input_interrupt_mode): Simplify #ifdefs.
+
+2010-11-15  Dan Nicolaescu  <address@hidden>
+
        Clean up systty.h macros.
        * systty.h (EMACS_GET_TTY_PGRP, EMACS_SET_TTY_PGRP, EMACS_GET_TTY)
        (EMACS_SET_TTY): Remove unneeded abstraction, instead inline the

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-11-14 06:55:27 +0000
+++ b/src/keyboard.c    2010-11-15 06:18:50 +0000
@@ -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