Merge from emacs-23

[gnu-emacs] / oldXMenu / Destroy.c

diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index 62b865d2c1a8090239de6cd1d66c315791d870c5..6a379609ad07efcec9e7266609b57f2134b9a96f 100644 (file)
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -1,7 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985  */
+
 #include "copyright.h"
 
-/* $Header: /cvsroot/emacs/emacs/oldXMenu/Destroy.c,v 1.3 2003/09/01 15:45:47 miles Exp $ */
-/* Copyright    Massachusetts Institute of Technology    1985  */
 
 /*
  * XMenu:      MIT Project Athena, X Window system menu package
@@ -15,9 +15,9 @@
 
 #include "XMenuInt.h"
 
-XMenuDestroy(display, menu)
-    Display *display;
-    register XMenu *menu;      /* Menu object to destroy. */
+XMenuDestroy(Display *display, register XMenu *menu)
+                     
+                               /* Menu object to destroy. */
 {
     register XMPane *p_ptr;    /* Pointer to the current pane. */
     register XMPane *p_next;   /* Pointer to the next pane. */
@@ -115,5 +115,3 @@ XMenuDestroy(display, menu)
     free(menu);
 }
 
-/* arch-tag: 44c9589f-5893-46fc-bc23-1b03a7f9c015
-   (do not change this comment) */