X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/4e6835dbc4e02adcca7770c555963a37ad7fb8b9..7f0869bd1d2f8681f86b0104dff1392d29634d0e:/oldXMenu/Create.c

diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 52560d01a6..8354208773 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -1,9 +1,24 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
-/* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
+/*
+Copyright (C) 1993-1994, 2001-2011  Free Software Foundation, Inc.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
  *
@@ -34,7 +49,6 @@
 #include "../src/bitmaps/stipple.xbm"
 
 #else
-#ifndef VMS
 
 #include <X11/bitmaps/dimple1>
 #include <X11/bitmaps/dimple3>
@@ -50,23 +64,6 @@
 #include <X11/bitmaps/cntr_ptrmsk>
 #include <X11/bitmaps/stipple>
 
-#else
-
-#include "[-.src.bitmaps]dimple1.xbm"
-#include "[-.src.bitmaps]dimple3.xbm"
-#include "[-.src.bitmaps]gray1.xbm"
-#include "[-.src.bitmaps]gray3.xbm"
-#include "[-.src.bitmaps]crosswv.xbm"
-
-#include "[-.src.bitmaps]leftptr.xbm"
-#include "[-.src.bitmaps]leftpmsk.xbm"
-#include "[-.src.bitmaps]rtptr.xbm"
-#include "[-.src.bitmaps]rtpmsk.xbm"
-#include "[-.src.bitmaps]cntrptr.xbm"
-#include "[-.src.bitmaps]cntrpmsk.xbm"
-#include "[-.src.bitmaps]stipple.xbm"
-
-#endif /* VMS */
 #endif /* not EMACS_BITMAP_FILES */
 
 #define DEF_FREEZE		0
@@ -93,19 +90,14 @@
 
 #define TILE_BUF_SIZE		5
 
-int atoi();
-double atof();
-char *x_get_resource_string ();
+int atoi(const char *);
+double atof(const char *);
+char *x_get_resource_string (char *attribute, char *class);
 
 
 
 static Status
-XAllocDisplayColor(display, map, colorName, color, junk)
-    Display *display;
-    Colormap map;
-    char *colorName;
-    XColor *color;
-    XColor *junk;
+XAllocDisplayColor(Display *display, Colormap map, char *colorName, XColor *color, XColor *junk)
 {
   return (colorName!=0 &&
 	  XParseColor(display, map, colorName, color) &&
@@ -114,10 +106,10 @@ XAllocDisplayColor(display, map, colorName, color, junk)
 
 
 XMenu *
-XMenuCreate(display, parent, def_env)
-    Display *display;           /* ID of previously opened display */
-    Window parent;		/* Window ID of the menu's parent window. */
-    register char *def_env;	/* X Defaults program environment name. */
+XMenuCreate(Display *display, Window parent, register char *def_env)
+                                /* ID of previously opened display */
+                  		/* Window ID of the menu's parent window. */
+                           	/* X Defaults program environment name. */
 {
   register int i;		/* Loop counter. */
   register int j;		/* Loop counter. */
@@ -761,5 +753,3 @@ XMenuCreate(display, parent, def_env)
   return(menu);
 }
 
-/* arch-tag: 6945b7d2-3b13-40b9-8b6e-56b1b20f3463
-   (do not change this comment) */