aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/make-docfile.c4
2 files changed, 8 insertions, 2 deletions
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 @@
12013-01-15 Paul Eggert <eggert@cs.ucla.edu>
2
3 * make-docfile.c (write_globals): Make it a bit clearer (Bug#13448).
4 This pacifies GCC 4.7.2 when Emacs is configured with
5 --enable-link-time-optimization and --enable-gcc-warnings.
6
12013-01-01 Juanma Barranquero <lekktu@gmail.com> 72013-01-01 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * makefile.w32-in (lisp1): Add macroexp.elc (bug#13320). 9 * 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)
624 qsort (globals, num_globals, sizeof (struct global), compare_globals); 624 qsort (globals, num_globals, sizeof (struct global), compare_globals);
625 for (i = 0; i < num_globals; ++i) 625 for (i = 0; i < num_globals; ++i)
626 { 626 {
627 char const *type; 627 char const *type = 0;
628 628
629 switch (globals[i].type) 629 switch (globals[i].type)
630 { 630 {
@@ -649,7 +649,7 @@ write_globals (void)
649 fatal ("not a recognized DEFVAR_", 0); 649 fatal ("not a recognized DEFVAR_", 0);
650 } 650 }
651 651
652 if (globals[i].type != FUNCTION) 652 if (type)
653 { 653 {
654 fprintf (outfile, " %s f_%s;\n", type, globals[i].name); 654 fprintf (outfile, " %s f_%s;\n", type, globals[i].name);
655 fprintf (outfile, "#define %s globals.f_%s\n", 655 fprintf (outfile, "#define %s globals.f_%s\n",