Merge from emacs-24; up to 2012-12-23T02:41:17Z!rgm@gnu.org

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

diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 3e111dc..ec1d09d 100644 (file)
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -1,37 +1,16 @@
 /* Copyright    Massachusetts Institute of Technology    1985  */
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
 
-#include <X11/Xlib.h>
-#include "X10.h"
-void emacs_remque();
-struct qelem {
-       struct    qelem *q_forw;
-       struct    qelem *q_back;
-       char q_data[1];
-};
+#include "XMenuInt.h"
 
 /*
  * XDeleteAssoc - Delete an association in an XAssocTable keyed on
  * an XId.  An association may be removed only once.  Redundant
  * deletes are meaningless (but cause no problems).
  */
-XDeleteAssoc(dpy, table, x_id)
-        register Display *dpy;
-       register XAssocTable *table;
-       register XID x_id;
+void
+XDeleteAssoc(register Display *dpy, register XAssocTable *table, register XID x_id)
 {
        int hash;
        register XAssoc *bucket;
@@ -69,6 +48,3 @@ XDeleteAssoc(dpy, table, x_id)
        /* It is apparently not in the table. */
        return;
 }
-
-/* arch-tag: 90981a7e-601c-487a-b364-cdf55d6c475b
-   (do not change this comment) */