summaryrefslogtreecommitdiff
path: root/src/lisp.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-08-31 19:37:22 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2014-08-31 19:37:22 -0700
commit1564080f0b24551765d7068b9fc02f6e5a78fea3 (patch)
treec710c96b8aef1bdb16ae9287b5fd775695a8547c /src/lisp.h
parent56f9f0ab54fd752773d8bb371a4032e43c9c224c (diff)
downloademacs-1564080f0b24551765d7068b9fc02f6e5a78fea3.tar.gz
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/lisp.h')
-rw-r--r--src/lisp.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h
index d31c5ae50c3..53d6cf8009e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3885,6 +3885,7 @@ intern_c_string (const char *str)
}
/* Defined in eval.c. */
+extern EMACS_INT lisp_eval_depth;
extern Lisp_Object Qexit, Qinteractive, Qcommandp, Qmacro;
extern Lisp_Object Qinhibit_quit, Qinternal_interpreter_environment, Qclosure;
extern Lisp_Object Qand_rest;
@@ -4419,6 +4420,11 @@ extern void syms_of_profiler (void);
extern char *emacs_root_dir (void);
#endif /* DOS_NT */
+/* Defined in lastfile.c. */
+extern char my_edata[];
+extern char my_endbss[];
+extern char *my_endbss_static;
+
/* True means ^G can quit instantly. */
extern bool immediate_quit;