* make-docfile.c (write_globals): Make it a bit clearer.

This pacifies GCC 4.7.2 when Emacs is configured with
--enable-link-time-optimization and --enable-gcc-warnings.

Fixes: debbugs:13448

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 92b970eb7781c0ba0b54eed92227c3e3d91aec22..2bdbebeb1108b991671111bd5ea4fa8c0469dd8b 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * make-docfile.c (write_globals): Make it a bit clearer (Bug#13448).
+       This pacifies GCC 4.7.2 when Emacs is configured with
+       --enable-link-time-optimization and --enable-gcc-warnings.
+
 2013-01-01  Juanma Barranquero  <lekktu@gmail.com>
 
        * makefile.w32-in (lisp1): Add macroexp.elc (bug#13320).

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 54a53c0d441e8864d81cb6241109bd791fa9657d..68e5279fd157d7d048455d011beca38db6f87e22 100644 (file)
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -624,7 +624,7 @@ write_globals (void)
   qsort (globals, num_globals, sizeof (struct global), compare_globals);
   for (i = 0; i < num_globals; ++i)
     {
-      char const *type;
+      char const *type = 0;
 
       switch (globals[i].type)
        {
@@ -649,7 +649,7 @@ write_globals (void)
          fatal ("not a recognized DEFVAR_", 0);
        }
 
-      if (globals[i].type != FUNCTION)
+      if (type)
        {
          fprintf (outfile, "  %s f_%s;\n", type, globals[i].name);
          fprintf (outfile, "#define %s globals.f_%s\n",