HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add conflict detection/resolution to vc-hg (bug#10709)
[bpt/emacs.git]
/
oldXMenu
/
Destroy.c
diff --git
a/oldXMenu/Destroy.c
b/oldXMenu/Destroy.c
index
082de88
..
7f0f614
100644
(file)
--- a/
oldXMenu/Destroy.c
+++ b/
oldXMenu/Destroy.c
@@
-1,8
+1,7
@@
+/* Copyright Massachusetts Institute of Technology 1985 */
+
#include "copyright.h"
#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
/*
* XMenu: MIT Project Athena, X Window system menu package
@@
-16,9
+15,10
@@
#include "XMenuInt.h"
#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. */
{
register XMPane *p_ptr; /* Pointer to the current pane. */
register XMPane *p_next; /* Pointer to the next pane. */
@@
-115,6
+115,3
@@
XMenuDestroy(display, menu)
*/
free(menu);
}
*/
free(menu);
}
-
-/* arch-tag: 44c9589f-5893-46fc-bc23-1b03a7f9c015
- (do not change this comment) */