aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-02-25 14:05:43 -0800
committerPaul Eggert2011-02-25 14:05:43 -0800
commit564ff1f20ced473e10179fc5a4cc1c85cb572b2b (patch)
tree65706fd697bc90b16e16cbcacc43c52e15d3307c
parent4ad89555139cef8136f98c7bd1ab83bf003ef5e4 (diff)
downloademacs-564ff1f20ced473e10179fc5a4cc1c85cb572b2b.tar.gz
emacs-564ff1f20ced473e10179fc5a4cc1c85cb572b2b.zip
* make-docfile.c (write_globals): Change char * to char const *
to avoid a GCC "assignment discards qualifiers" diagnostic in some configurations.
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/make-docfile.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2c98cdf59a6..61480cfaec0 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
12011-02-25 Paul Eggert <eggert@cs.ucla.edu>
2
3 * make-docfile.c (write_globals): Change char * to char const *
4 to avoid a GCC "assignment discards qualifiers" diagnostic
5 in some configurations.
6
12011-02-22 Eli Zaretskii <eliz@gnu.org> 72011-02-22 Eli Zaretskii <eliz@gnu.org>
2 8
3 * etags.c (canonicalize_filename, ISUPPER): Fix last change. 9 * etags.c (canonicalize_filename, ISUPPER): Fix last change.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index f0aa222986a..12dbdbee219 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -617,7 +617,7 @@ write_globals (void)
617 qsort (globals, num_globals, sizeof (struct global), compare_globals); 617 qsort (globals, num_globals, sizeof (struct global), compare_globals);
618 for (i = 0; i < num_globals; ++i) 618 for (i = 0; i < num_globals; ++i)
619 { 619 {
620 char *type; 620 char const *type;
621 621
622 switch (globals[i].type) 622 switch (globals[i].type)
623 { 623 {