Merge from trunk + rename the event. Not tested yet.

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

diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index d43b9c9..94c0454 100644 (file)
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -1,27 +1,15 @@
-/* $XConsortium: XDestAssoc.c,v 10.17 91/02/08 13:11:50 rws Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985  */
 
-/*
-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"
+#include "XMenuInt.h"
 
 /*
  * XDestroyAssocTable - Destroy (free the memory associated with)
  * an XAssocTable.
  */
-XDestroyAssocTable(table)
-       register XAssocTable *table;
+void
+XDestroyAssocTable(register XAssocTable *table)
 {
        register int i;
        register XAssoc *bucket;
@@ -46,4 +34,3 @@ XDestroyAssocTable(table)
        /* Free the table. */
        free((char *)table);
 }
-