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.

10 files changed, 41 insertions, 26 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 26ee524acda..0bf0842690b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2014-09-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Clean up extern decls a bit.
+        * bytecode.c: Include blockinput.h and keyboard.h rather
+        than rolling their APIs by hand.
+        * emacs.c: Include regex.h and rely on its and lisp.h's API
+        rather than rolling them by hand.
+        * lastfile.c: Include lisp.h, to check this file's API.
+        * lisp.h (lisp_eval_depth, my_edata, my_endbss, my_endbss_static):
+        New decls.
+        * regex.h (re_max_failures): New decl.
+        * unexcw.c, unexmacosx.c, unexw32.c:
+        Rely on lisp.h's API rather than rolling it by hand.
+        * vm-limit.c (__after_morecore_hook, __morecore, real_morecore):
+        Declare at top level, to pacify GCC -Wnested-externs.
+
 2014-08-31  Eli Zaretskii  <eliz@gnu.org>
 
         * xdisp.c (get_glyph_string_clip_rects): Don't let the width of a
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:
 #include <config.h>
 
 #include "lisp.h"
+#include "blockinput.h"
 #include "character.h"
 #include "buffer.h"
+#include "keyboard.h"
 #include "syntax.h"
 #include "window.h"
 
@@ -1106,9 +1108,6 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
           goto pushhandler;
         CASE (Bpushconditioncase): /* New in 24.4.  */
           {
-            extern EMACS_INT lisp_eval_depth;
-            extern int poll_suppress_count;
-            extern int interrupt_input_blocked;
             struct handler *c;
             Lisp_Object tag;
             int dest;
diff --git a/src/emacs.c b/src/emacs.c
index 0b52659172c..9b05d68b914 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -83,6 +83,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "charset.h"
 #include "composite.h"
 #include "dispextern.h"
+#include "regex.h"
 #include "syntax.h"
 #include "sysselect.h"
 #include "systime.h"
@@ -741,9 +742,6 @@ main (int argc, char **argv)
 #ifdef GNU_LINUX
   if (!initialized)
     {
-      extern char my_endbss[];
-      extern char *my_endbss_static;
-
       if (my_heap_start == 0)
         my_heap_start = sbrk (0);
 
@@ -872,7 +870,6 @@ main (int argc, char **argv)
       && !getrlimit (RLIMIT_STACK, &rlim))
     {
       long newlim;
-      extern size_t re_max_failures;
       /* Approximate the amount regex.c needs per unit of re_max_failures.  */
       int ratio = 20 * sizeof (char *);
       /* Then add 33% to cover the size of the smaller stacks that regex.c
@@ -2136,10 +2133,7 @@ You must run Emacs in batch mode in order to dump it.  */)
 #ifndef WINDOWSNT
   /* On Windows, this was done before dumping, and that once suffices.
      Meanwhile, my_edata is not valid on Windows.  */
-  {
-    extern char my_edata[];
-    memory_warnings (my_edata, malloc_warning);
-  }
+  memory_warnings (my_edata, malloc_warning);
 #endif /* not WINDOWSNT */
 #endif /* not SYSTEM_MALLOC and not HYBRID_MALLOC */
 #ifdef DOUG_LEA_MALLOC
diff --git a/src/lastfile.c b/src/lastfile.c
index a900e9541c8..e7136e069d0 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -36,6 +36,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
+#include <lisp.h>
+
 char my_edata[] = "End of Emacs initialized data";
 
 /* Help unexec locate the end of the .bss area used by Emacs (which
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;
 
diff --git a/src/regex.h b/src/regex.h
index 1b064987eb7..0e25723a85e 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -172,6 +172,9 @@ extern reg_syntax_t re_syntax_options;
 extern Lisp_Object re_match_object;
 #endif
 
+/* Roughly the maximum number of failure points on the stack.  */
+extern size_t re_max_failures;
+
 
 /* Define combinations of the above bits for the standard possibilities.
    (The [[[ comments delimit what gets put into the Texinfo file, so
diff --git a/src/unexcw.c b/src/unexcw.c
index 72456b33ec4..cdeb899fd30 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -34,10 +34,6 @@ extern void report_sheap_usage (int);
 
 extern int bss_sbrk_did_unexec;
 
-/* emacs symbols that indicate where bss and data end for emacs internals */
-extern char my_endbss[];
-extern char my_edata[];
-
 /*
 ** header for Windows executable files
 */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index 8cd80a7a544..ae34237a66b 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -826,7 +826,6 @@ copy_data_segment (struct load_command *lc)
          file.  */
       if (strncmp (sectp->sectname, SECT_DATA, 16) == 0)
         {
-          extern char my_edata[];
           unsigned long my_size;
 
           /* The __data section is basically dumped from memory.  But
@@ -857,7 +856,6 @@ copy_data_segment (struct load_command *lc)
         }
       else if (strncmp (sectp->sectname, SECT_BSS, 16) == 0)
         {
-          extern char *my_endbss_static;
           unsigned long my_size;
 
           sectp->flags = S_REGULAR;
diff --git a/src/unexw32.c b/src/unexw32.c
index 7cbd95a46fe..95c805d09ae 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -43,11 +43,8 @@ PIMAGE_NT_HEADERS
 extern BOOL ctrl_c_handler (unsigned long type);
 
 extern char my_begdata[];
-extern char my_edata[];
 extern char my_begbss[];
-extern char my_endbss[];
 extern char *my_begbss_static;
-extern char *my_endbss_static;
 
 #include "w32heap.h"
 
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 308613f7eb4..015f3ee2111 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -51,6 +51,15 @@ char data_start[1] = { 1 };
 # endif
 #endif
 
+/* From gmalloc.c.  */
+extern void (* __after_morecore_hook) (void);
+extern void *(*__morecore) (ptrdiff_t);
+
+/* From ralloc.c.  */
+#ifdef REL_ALLOC
+extern void *(*real_morecore) (ptrdiff_t);
+#endif
+
 /*
   Level number of warnings already issued.
   0 -- no warnings issued.
@@ -130,12 +139,9 @@ ret_lim_data (void)
 static void
 check_memory_limits (void)
 {
-#ifdef REL_ALLOC
-  extern void *(*real_morecore) (ptrdiff_t);
-#else
+#ifndef REL_ALLOC
   void *(*real_morecore) (ptrdiff_t) = 0;
 #endif
-  extern void *(*__morecore) (ptrdiff_t);
 
   char *cp;
   size_t five_percent;
@@ -203,8 +209,6 @@ check_memory_limits (void)
 void
 memory_warnings (void *start, void (*warnfun) (const char *))
 {
-  extern void (* __after_morecore_hook) (void);     /* From gmalloc.c */
-
   data_space_start = start ? start : data_start;
 
   warn_function = warnfun;