Merge changes from emacs-23 branch

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

diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index 1772321..c2dd8d4 100644 (file)
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -1,18 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985  */
-/* Copyright (C) 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"
@@ -21,8 +10,7 @@ without express or implied warranty.
  * XDestroyAssocTable - Destroy (free the memory associated with)
  * an XAssocTable.
  */
-XDestroyAssocTable(table)
-       register XAssocTable *table;
+XDestroyAssocTable(register XAssocTable *table)
 {
        register int i;
        register XAssoc *bucket;