aboutsummaryrefslogtreecommitdiffstats
path: root/src/bytecode.c
diff options
context:
space:
mode:
authorPaul Eggert2014-08-31 19:37:22 -0700
committerPaul Eggert2014-08-31 19:37:22 -0700
commit1564080f0b24551765d7068b9fc02f6e5a78fea3 (patch)
treec710c96b8aef1bdb16ae9287b5fd775695a8547c /src/bytecode.c
parent56f9f0ab54fd752773d8bb371a4032e43c9c224c (diff)
downloademacs-1564080f0b24551765d7068b9fc02f6e5a78fea3.tar.gz
emacs-1564080f0b24551765d7068b9fc02f6e5a78fea3.zip
Clean up extern decls a bit.
* configure.ac (WERROR_CFLAGS): Don't disable -Wnested-externs. While we're at it, don't disable -Wlogical-op either. * src/bytecode.c: Include blockinput.h and keyboard.h rather than rolling their APIs by hand. * src/emacs.c: Include regex.h and rely on its and lisp.h's API rather than rolling them by hand. * src/lastfile.c: Include lisp.h, to check this file's API. * src/lisp.h (lisp_eval_depth, my_edata, my_endbss, my_endbss_static): New decls. * src/regex.h (re_max_failures): New decl. * src/unexcw.c, src/unexmacosx.c, src/unexw32.c: Rely on lisp.h's API rather than rolling it by hand. * src/vm-limit.c (__after_morecore_hook, __morecore, real_morecore): Declare at top level, to pacify GCC -Wnested-externs.
Diffstat (limited to 'src/bytecode.c')
-rw-r--r--src/bytecode.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/bytecode.c b/src/bytecode.c
index ca6681f21e9..d3c8b470cc3 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -36,8 +36,10 @@ by Hallvard:
36#include <config.h> 36#include <config.h>
37 37
38#include "lisp.h" 38#include "lisp.h"
39#include "blockinput.h"
39#include "character.h" 40#include "character.h"
40#include "buffer.h" 41#include "buffer.h"
42#include "keyboard.h"
41#include "syntax.h" 43#include "syntax.h"
42#include "window.h" 44#include "window.h"
43 45
@@ -1106,9 +1108,6 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
1106 goto pushhandler; 1108 goto pushhandler;
1107 CASE (Bpushconditioncase): /* New in 24.4. */ 1109 CASE (Bpushconditioncase): /* New in 24.4. */
1108 { 1110 {
1109 extern EMACS_INT lisp_eval_depth;
1110 extern int poll_suppress_count;
1111 extern int interrupt_input_blocked;
1112 struct handler *c; 1111 struct handler *c;
1113 Lisp_Object tag; 1112 Lisp_Object tag;
1114 int dest; 1113 int dest;