[Emacs-diffs] /srv/bzr/emacs/trunk r111533: * make-docfile.c (write_globals): Make it a bit clearer.

[Paul Eggert]

------------------------------------------------------------
revno: 111533
fixes bug: http://debbugs.gnu.org/13448
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2013-01-15 13:26:01 -0800
message:
  * 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.
modified:
  lib-src/ChangeLog
  lib-src/make-docfile.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2013-01-02 16:13:04 +0000
+++ b/lib-src/ChangeLog 2013-01-15 21:26:01 +0000
@@ -1,3 +1,9 @@
+2013-01-15  Paul Eggert  <address@hidden>
+
+       * 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  <address@hidden>
 
        * makefile.w32-in (lisp1): Add macroexp.elc (bug#13320).

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2013-01-01 09:11:05 +0000
+++ b/lib-src/make-docfile.c    2013-01-15 21:26:01 +0000
@@ -624,7 +624,7 @@
   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 @@
          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",