Make Emacs compile with clang.

* oldXMenu/XMakeAssoc.c (XMakeAssoc):
* oldXMenu/XDelAssoc.c (XDeleteAssoc): Declare the return type.

Fixes: debbugs:7309

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index a7a1b849519c3575ac1bf543b318e0e2c21b90d9..98746286771086ea3a3b43a5e196ec4edda9460b 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-01  Elias Pipping  <pipping.elias@googlemail.com>
+
+       Make Emacs compile with clang (bug#7309).
+       * XMakeAssoc.c (XMakeAssoc):
+       * XDelAssoc.c (XDeleteAssoc): Declare the return type.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
        * Version 23.2 released.

diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 11e8c35a774db2a300c7396944174275970ee553..e0f78b6acaa34ec6a2b5cc3a95b3001c9e3d9be8 100644 (file)
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -17,6 +17,7 @@ struct qelem {
  * 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;

diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index cf039c8f3c1f3f206be3e3ea2223219e4239d778..e46674db605d50622ce3f556cdd0b9f3f2bc0355 100644 (file)
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -27,6 +27,7 @@ struct qelem {
  * 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;