Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

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

diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index fae6def..9443481 100644 (file)
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -1,17 +1,6 @@
-/* $XConsortium: XCrAssoc.c,v 10.17 91/01/06 12:04:57 rws Exp $ */
 /* Copyright    Massachusetts Institute of Technology    1985  */
+#include "copyright.h"
 
-/*
-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 <config.h>
 #include <X11/Xlib.h>
@@ -22,8 +11,6 @@ without express or implied warranty.
 #define NULL 0
 #endif
 
-extern int errno;
-
 /*
  * XCreateAssocTable - Create an XAssocTable.  The size argument should be
  * a power of two for efficiency reasons.  Some size suggestions: use 32
@@ -31,8 +18,8 @@ extern int errno;
  * buckets is 8.  If there is an error creating the XAssocTable, a NULL
  * pointer is returned.
  */
-XAssocTable *XCreateAssocTable(size)
-       register int size;              /* Desired size of the table. */
+XAssocTable *XCreateAssocTable(register int size)
+                                       /* Desired size of the table. */
 {
        register XAssocTable *table;    /* XAssocTable to be initialized. */
        register XAssoc *buckets;       /* Pointer to the first bucket in */
@@ -66,3 +53,4 @@ XAssocTable *XCreateAssocTable(size)
 
        return(table);
 }
+