From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 15 Jan 2013 21:26:01 +0000 (-0800)
Subject: * make-docfile.c (write_globals): Make it a bit clearer.
X-Git-Tag: emacs-24.3.90~173^2~7^2~289
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a353a145dba49c91cdf4d2189ebe6579cae24ac;p=emacs.git

* 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 92b970eb778..2bdbebeb110 100644
--- 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 54a53c0d441..68e5279fd15 100644
--- 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",