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

diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index d443084ac1..9bbde2cf94 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -3,35 +3,22 @@
 #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
 
-extern int errno;
-
-void emacs_insque();
-struct qelem {
-	struct    qelem *q_forw;
-	struct    qelem *q_back;
-	char q_data[1];
-};
 /*
  * XMakeAssoc - Insert data into an XAssocTable keyed on an XId.
  * Data is inserted into the table only once.  Redundant inserts are
  * meaningless (but cause no problems).  The queue in each association
  * bucket is sorted (lowest XId to highest XId).
  */
-XMakeAssoc(dpy, table, x_id, data)
-	register Display *dpy;
-	register XAssocTable *table;
-	register XID x_id;
-	register caddr_t data;
+void
+XMakeAssoc(register Display *dpy, register XAssocTable *table, register XID x_id, register void *data)
 {
 	int hash;
 	register XAssoc *bucket;
@@ -81,7 +68,7 @@ XMakeAssoc(dpy, table, x_id, data)
 	/* If we are here then the new entry should be inserted just */
 	/* before the current value of "Entry". */
 	/* Create a new XAssoc and load it with new provided data. */
-	new_entry = (XAssoc *) xmalloc(sizeof(XAssoc));
+	new_entry = (XAssoc *) malloc(sizeof(XAssoc));
 	new_entry->display = dpy;
 	new_entry->x_id = x_id;
 	new_entry->data = data;
@@ -89,6 +76,3 @@ XMakeAssoc(dpy, table, x_id, data)
 	/* Insert the new entry. */
 	emacs_insque((struct qelem *)new_entry, (struct qelem *)Entry->prev);
 }
-
-/* arch-tag: d7e3fb8a-f3b3-4c5d-a307-75ca67ec1b49
-   (do not change this comment) */