HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org
[bpt/emacs.git]
/
oldXMenu
/
XMakeAssoc.c
diff --git
a/oldXMenu/XMakeAssoc.c
b/oldXMenu/XMakeAssoc.c
index
3626eb0
..
143b264
100644
(file)
--- a/
oldXMenu/XMakeAssoc.c
+++ b/
oldXMenu/XMakeAssoc.c
@@
-4,22
+4,14
@@
#include <config.h>
#include <config.h>
-#include
<X11/Xlib.h>
+#include
"XMenuInt.h"
#include <X11/Xresource.h>
#include <X11/Xresource.h>
-#include "X10.h"
#include <errno.h>
#ifndef NULL
#define NULL 0
#endif
#include <errno.h>
#ifndef NULL
#define NULL 0
#endif
-struct qelem {
- struct qelem *q_forw;
- struct qelem *q_back;
- char q_data[1];
-};
-void emacs_insque (struct qelem *elem, struct qelem *prev);
-
/*
* XMakeAssoc - Insert data into an XAssocTable keyed on an XId.
* Data is inserted into the table only once. Redundant inserts are
/*
* XMakeAssoc - Insert data into an XAssocTable keyed on an XId.
* Data is inserted into the table only once. Redundant inserts are
@@
-27,7
+19,7
@@
void emacs_insque (struct qelem *elem, struct qelem *prev);
* bucket is sorted (lowest XId to highest XId).
*/
void
* bucket is sorted (lowest XId to highest XId).
*/
void
-XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register
caddr_t
data)
+XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register
void *
data)
{
int hash;
register XAssoc *bucket;
{
int hash;
register XAssoc *bucket;
@@
-85,4
+77,3
@@
XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id
/* Insert the new entry. */
emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev);
}
/* Insert the new entry. */
emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev);
}
-