[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100147: Make Emacs compile with clang.

[Stefan Monnier]

------------------------------------------------------------
revno: 100147
author: Elias Pipping <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-10-31 22:01:43 -0400
message:
  Make Emacs compile with clang.
  * oldXMenu/XMakeAssoc.c (XMakeAssoc):
  * oldXMenu/XDelAssoc.c (XDeleteAssoc): Declare the return type.
modified:
  oldXMenu/ChangeLog
  oldXMenu/XDelAssoc.c
  oldXMenu/XMakeAssoc.c

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2010-05-08 03:28:26 +0000
+++ b/oldXMenu/ChangeLog        2010-11-01 02:01:43 +0000
@@ -1,3 +1,9 @@
+2010-11-01  Elias Pipping  <address@hidden>
+
+       Make Emacs compile with clang (bug#7309).
+       * XMakeAssoc.c (XMakeAssoc):
+       * XDelAssoc.c (XDeleteAssoc): Declare the return type.
+
 2010-05-07  Chong Yidong  <address@hidden>
 
        * Version 23.2 released.

=== modified file 'oldXMenu/XDelAssoc.c'
--- a/oldXMenu/XDelAssoc.c      2010-01-04 05:35:18 +0000
+++ b/oldXMenu/XDelAssoc.c      2010-11-01 02:01:43 +0000
@@ -17,6 +17,7 @@
  * an XId.  An association may be removed only once.  Redundant
  * deletes are meaningless (but cause no problems).
  */
+void
 XDeleteAssoc(dpy, table, x_id)
         register Display *dpy;
        register XAssocTable *table;

=== modified file 'oldXMenu/XMakeAssoc.c'
--- a/oldXMenu/XMakeAssoc.c     2010-01-04 05:35:18 +0000
+++ b/oldXMenu/XMakeAssoc.c     2010-11-01 02:01:43 +0000
@@ -27,6 +27,7 @@
  * meaningless (but cause no problems).  The queue in each association
  * bucket is sorted (lowest XId to highest XId).
  */
+void
 XMakeAssoc(dpy, table, x_id, data)
        register Display *dpy;
        register XAssocTable *table;