aboutsummaryrefslogtreecommitdiffstats
path: root/oldXMenu
diff options
context:
space:
mode:
authorElias Pipping2010-10-31 22:01:43 -0400
committerStefan Monnier2010-10-31 22:01:43 -0400
commit7632038413c4dc2a7c8a7f3d0d8d8af42907f287 (patch)
tree3a8f4481aa40ac1a9e2c1fdc7d1e18aba6ca7e24 /oldXMenu
parent46eadc7aeedf0fe3944291e2631d8604b38fe25f (diff)
downloademacs-7632038413c4dc2a7c8a7f3d0d8d8af42907f287.tar.gz
emacs-7632038413c4dc2a7c8a7f3d0d8d8af42907f287.zip
Make Emacs compile with clang.
* oldXMenu/XMakeAssoc.c (XMakeAssoc): * oldXMenu/XDelAssoc.c (XDeleteAssoc): Declare the return type. Fixes: debbugs:7309
Diffstat (limited to 'oldXMenu')
-rw-r--r--oldXMenu/ChangeLog6
-rw-r--r--oldXMenu/XDelAssoc.c1
-rw-r--r--oldXMenu/XMakeAssoc.c1
3 files changed, 8 insertions, 0 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index a7a1b849519..98746286771 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,9 @@
12010-11-01 Elias Pipping <pipping.elias@googlemail.com>
2
3 Make Emacs compile with clang (bug#7309).
4 * XMakeAssoc.c (XMakeAssoc):
5 * XDelAssoc.c (XDeleteAssoc): Declare the return type.
6
12010-05-07 Chong Yidong <cyd@stupidchicken.com> 72010-05-07 Chong Yidong <cyd@stupidchicken.com>
2 8
3 * Version 23.2 released. 9 * 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 {
17 * an XId. An association may be removed only once. Redundant 17 * an XId. An association may be removed only once. Redundant
18 * deletes are meaningless (but cause no problems). 18 * deletes are meaningless (but cause no problems).
19 */ 19 */
20void
20XDeleteAssoc(dpy, table, x_id) 21XDeleteAssoc(dpy, table, x_id)
21 register Display *dpy; 22 register Display *dpy;
22 register XAssocTable *table; 23 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 {
27 * meaningless (but cause no problems). The queue in each association 27 * meaningless (but cause no problems). The queue in each association
28 * bucket is sorted (lowest XId to highest XId). 28 * bucket is sorted (lowest XId to highest XId).
29 */ 29 */
30void
30XMakeAssoc(dpy, table, x_id, data) 31XMakeAssoc(dpy, table, x_id, data)
31 register Display *dpy; 32 register Display *dpy;
32 register XAssocTable *table; 33 register XAssocTable *table;