aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorAndreas Schwab2012-07-06 21:50:17 +0200
committerAndreas Schwab2012-07-06 21:50:17 +0200
commit9c32bf45f491d35641751533eb5e399306b60947 (patch)
treeab3c757e472f8b4143a7af6dfe8a73924dec3e24 /lib-src
parentddadbc0e71e7b1be4e79447a7c134b0762d104eb (diff)
downloademacs-9c32bf45f491d35641751533eb5e399306b60947.tar.gz
emacs-9c32bf45f491d35641751533eb5e399306b60947.zip
* make-docfile.c (write_globals): Warn about duplicate function
definitions with differing signatures.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog5
-rw-r--r--lib-src/make-docfile.c8
2 files changed, 12 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 54e9e405cfd..11f2a688cd2 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
12012-07-06 Andreas Schwab <schwab@linux-m68k.org>
2
3 * make-docfile.c (write_globals): Warn about duplicate function
4 definitions with differing signatures.
5
12012-07-03 Paul Eggert <eggert@cs.ucla.edu> 62012-07-03 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * make-docfile.c (scan_c_file): Suppress GCC warning. 8 * make-docfile.c (scan_c_file): Suppress GCC warning.
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 4e961bb56ed..99c43da97f5 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -693,7 +693,13 @@ write_globals (void)
693 693
694 while (i + 1 < num_globals 694 while (i + 1 < num_globals
695 && !strcmp (globals[i].name, globals[i + 1].name)) 695 && !strcmp (globals[i].name, globals[i + 1].name))
696 ++i; 696 {
697 if (globals[i].type == FUNCTION
698 && globals[i].value != globals[i + 1].value)
699 error ("function '%s' defined twice with differing signatures",
700 globals[i].name);
701 ++i;
702 }
697 } 703 }
698 704
699 if (!seen_defun) 705 if (!seen_defun)