diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-09 15:07:10 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-11-09 15:07:10 -0500 |
| commit | d607b96bc2824116a8fe0e5840ce49da7ce4514f (patch) | |
| tree | 229a11bba88b67e8961db4d10aa8b3725f3a4873 /oldXMenu | |
| parent | 27410d0ac3406a341cc90ada064047a7f1ea5209 (diff) | |
| parent | c00980655bc15ca019fd6c559c69601be18f2407 (diff) | |
| download | emacs-d607b96bc2824116a8fe0e5840ce49da7ce4514f.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/ChangeLog | 6 | ||||
| -rw-r--r-- | oldXMenu/XDelAssoc.c | 1 | ||||
| -rw-r--r-- | oldXMenu/XMakeAssoc.c | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index f05553a38b3..329a4ac9565 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,9 @@ +2010-11-09 Elias Pipping <pipping.elias@googlemail.com> (tiny change) + + Make Emacs compile with clang (bug#7309). + * XMakeAssoc.c (XMakeAssoc): + * XDelAssoc.c (XDeleteAssoc): Declare the return type. + 2010-07-12 Dan Nicolaescu <dann@ics.uci.edu> * XMenu.h: Include <stdlib.h>. diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c index 7aca50aa56b..43446ae8a25 100644 --- a/oldXMenu/XDelAssoc.c +++ b/oldXMenu/XDelAssoc.c @@ -17,6 +17,7 @@ void emacs_remque(struct qelem*); * an XId. An association may be removed only once. Redundant * deletes are meaningless (but cause no problems). */ +void XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id) { int hash; diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c index 84157399b43..3c79d17dc6a 100644 --- a/oldXMenu/XMakeAssoc.c +++ b/oldXMenu/XMakeAssoc.c @@ -26,6 +26,7 @@ void emacs_insque (struct qelem *elem, struct qelem *prev); * meaningless (but cause no problems). The queue in each association * bucket is sorted (lowest XId to highest XId). */ +void XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register caddr_t data) { int hash; |