From: Elias Pipping <pipping.elias@googlemail.com>
Date: Mon, 1 Nov 2010 02:01:43 +0000 (-0400)
Subject: Make Emacs compile with clang.
X-Git-Tag: emacs-pretest-23.2.90~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7632038413c4dc2a7c8a7f3d0d8d8af42907f287;p=emacs.git

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 a7a1b849519..98746286771 100644
--- 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 11e8c35a774..e0f78b6acaa 100644
--- 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 cf039c8f3c1..e46674db605 100644
--- 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;