aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-10-10 17:32:25 -0700
committerPaul Eggert2012-10-10 17:32:25 -0700
commitc1af190b72f9268dd23c13d43962a64c78aa4174 (patch)
treec6a241f6a51dc2d287aada9303ed3c2eb0bd3afb /src
parente85aafe7bd42773bf517193397c1a0ef0ed6b4a6 (diff)
downloademacs-c1af190b72f9268dd23c13d43962a64c78aa4174.tar.gz
emacs-c1af190b72f9268dd23c13d43962a64c78aa4174.zip
* w32select.c (waiting_for_input): Declare by including "keyboard.h"
instead of having a wrong decl.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/w32select.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 19a19e7668c..12b14625a91 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12012-10-11 Paul Eggert <eggert@cs.ucla.edu> 12012-10-11 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * w32select.c (waiting_for_input): Declare by including "keyboard.h"
4 instead of having a wrong decl.
3 * nsmenu.m (waiting_for_input): Remove wrong decl. 5 * nsmenu.m (waiting_for_input): Remove wrong decl.
4 6
52012-10-10 Paul Eggert <eggert@cs.ucla.edu> 72012-10-10 Paul Eggert <eggert@cs.ucla.edu>
diff --git a/src/w32select.c b/src/w32select.c
index ee0e6d16b11..1b10c74cfe9 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -76,6 +76,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
76#include "lisp.h" 76#include "lisp.h"
77#include "w32term.h" /* for all of the w32 includes */ 77#include "w32term.h" /* for all of the w32 includes */
78#include "w32common.h" /* os_subtype */ 78#include "w32common.h" /* os_subtype */
79#include "keyboard.h"
79#include "blockinput.h" 80#include "blockinput.h"
80#include "charset.h" 81#include "charset.h"
81#include "coding.h" 82#include "coding.h"
@@ -393,7 +394,6 @@ run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg)
393 with global variables and calling strange looking functions. Is 394 with global variables and calling strange looking functions. Is
394 this really the right way to run Lisp callbacks? */ 395 this really the right way to run Lisp callbacks? */
395 396
396 extern int waiting_for_input; /* from keyboard.c */
397 int owfi; 397 int owfi;
398 398
399 block_input (); 399 block_input ();