# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1289801930 28800
# Node ID a112abc60888ff052ea5ad014b75fe488974a33c
# Parent  107fd4b37e9db21eeba57810d173370282cfe395
* src/keyboard.c (pending_malloc_warning): Add const to match
definition in alloc.c.
(Fset_input_interrupt_mode): Simplify #ifdefs.

diff -r 107fd4b37e9d -r a112abc60888 src/ChangeLog
--- 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.
diff -r 107fd4b37e9d -r a112abc60888 src/keyboard.c
--- 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