diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 2 | ||||
-rw-r--r-- | src/w32select.c | 2 |
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 @@ 2012-10-11 Paul Eggert <eggert@cs.ucla.edu> + * w32select.c (waiting_for_input): Declare by including "keyboard.h" + instead of having a wrong decl. * nsmenu.m (waiting_for_input): Remove wrong decl. 2012-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/>. */ #include "lisp.h" #include "w32term.h" /* for all of the w32 includes */ #include "w32common.h" /* os_subtype */ +#include "keyboard.h" #include "blockinput.h" #include "charset.h" #include "coding.h" @@ -393,7 +394,6 @@ run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg) with global variables and calling strange looking functions. Is this really the right way to run Lisp callbacks? */ - extern int waiting_for_input; /* from keyboard.c */ int owfi; block_input (); |