Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

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

diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index b7f34fc..7f0f614 100644 (file)
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -1,7 +1,7 @@
+/* Copyright    Massachusetts Institute of Technology    1985  */
+
 #include "copyright.h"
 
-/* $Header: /u/src/emacs/19.0/oldXMenu/RCS/Destroy.c,v 1.1 1992/04/11 22:10:18 jimb Exp $ */
-/* Copyright    Massachusetts Institute of Technology    1985  */
 
 /*
  * XMenu:      MIT Project Athena, X Window system menu package
@@ -15,9 +15,10 @@
 
 #include "XMenuInt.h"
 
-XMenuDestroy(display, menu)
-    Display *display;
-    register XMenu *menu;      /* Menu object to destroy. */
+void
+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. */
@@ -80,33 +81,33 @@ XMenuDestroy(display, menu)
      */
     if ((menu->p_bdr_color != BlackPixel(display, DefaultScreen(display))) && (menu->p_bdr_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
-                   display, 
+                   display,
                    DefaultColormap(display, DefaultScreen(display)),
-                   &menu->p_bdr_color, 
+                   &menu->p_bdr_color,
                    1, 0);
     if ((menu->s_bdr_color != BlackPixel(display, DefaultScreen(display))) && (menu->s_bdr_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
-                   display, 
-                   DefaultColormap(display, DefaultScreen(display)), 
-                   &menu->s_bdr_color, 
+                   display,
+                   DefaultColormap(display, DefaultScreen(display)),
+                   &menu->s_bdr_color,
                    1, 0);
     if ((menu->p_frg_color != BlackPixel(display, DefaultScreen(display))) && (menu->p_frg_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
-                   display, 
+                   display,
                    DefaultColormap(display, DefaultScreen(display)),
-                   &menu->p_frg_color, 
+                   &menu->p_frg_color,
                    1, 0);
     if ((menu->s_frg_color != BlackPixel(display, DefaultScreen(display))) && (menu->s_frg_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
-                   display, 
+                   display,
                    DefaultColormap(display, DefaultScreen(display)),
-                   &menu->s_frg_color, 
+                   &menu->s_frg_color,
                    1, 0);
     if ((menu->bkgnd_color != BlackPixel(display, DefaultScreen(display))) && (menu->bkgnd_color != WhitePixel(display, DefaultScreen(display))))
        XFreeColors(
-                   display, 
+                   display,
                    DefaultColormap(display, DefaultScreen(display)),
-                   &menu->bkgnd_color, 
+                   &menu->bkgnd_color,
                    1, 0);
 
     /*