X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/8678d9e413593b0abab296551a20589745c459da..7a2657fa3bedbd977f4e11fe030cb4a210c04ab4:/oldXMenu/XMakeAssoc.c

diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index 3626eb01f5..9bbde2cf94 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -3,23 +3,14 @@
 #include "copyright.h"
 
 
-#include <config.h>
-#include <X11/Xlib.h>
+#include "XMenuInt.h"
 #include <X11/Xresource.h>
-#include "X10.h"
 #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
@@ -27,7 +18,7 @@ void emacs_insque (struct qelem *elem, struct qelem *prev);
  * 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;
@@ -85,4 +76,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);
 }
-