[Emacs-diffs] /srv/bzr/emacs/trunk r108919: * make-docfile.c (write_globals): Warn about duplicate function

[Andreas Schwab]

------------------------------------------------------------
revno: 108919
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Fri 2012-07-06 21:50:17 +0200
message:
  * make-docfile.c (write_globals): Warn about duplicate function
  definitions with differing signatures.
modified:
  lib-src/ChangeLog
  lib-src/make-docfile.c

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2012-07-03 21:14:48 +0000
+++ b/lib-src/ChangeLog 2012-07-06 19:50:17 +0000
@@ -1,3 +1,8 @@
+2012-07-06  Andreas Schwab  <address@hidden>
+
+       * make-docfile.c (write_globals): Warn about duplicate function
+       definitions with differing signatures.
+
 2012-07-03  Paul Eggert  <address@hidden>
 
        * make-docfile.c (scan_c_file): Suppress GCC warning.

=== modified file 'lib-src/make-docfile.c'
--- a/lib-src/make-docfile.c    2012-07-03 21:14:48 +0000
+++ b/lib-src/make-docfile.c    2012-07-06 19:50:17 +0000
@@ -693,7 +693,13 @@
 
       while (i + 1 < num_globals
             && !strcmp (globals[i].name, globals[i + 1].name))
-       ++i;
+       {
+         if (globals[i].type == FUNCTION
+             && globals[i].value != globals[i + 1].value)
+           error ("function '%s' defined twice with differing signatures",
+                  globals[i].name);
+         ++i;
+       }
     }
 
   if (!seen_defun)