Merge changes from emacs-23 branch.

[gnu-emacs] / oldXMenu / Destroy.c

diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index 082de8872a435fb2363a7ad1fda2c227f2b68208..906d92fb8cf59b54988125b7991b2bef58a81048 100644 (file)
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -1,8 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985  */
+
 #include "copyright.h"
 
-/* Copyright    Massachusetts Institute of Technology    1985  */
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:      MIT Project Athena, X Window system menu package
@@ -16,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. */