Merge from emacs-24

[bpt/emacs.git] / oldXMenu / XMakeAssoc.c

diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index 3626eb0..9bbde2c 100644 (file)
--- 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);
 }
-