Merge from emacs-23 branch, up to 2010-05-20T21:33:58Z!juri@jurta.org.

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

diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 77115b2..fc979ad 100644 (file)
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -1,9 +1,25 @@
 /* Copyright    Massachusetts Institute of Technology    1985  */
-/* Copyright (C) 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
+/*
+Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010, 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 +50,6 @@
 #include "../src/bitmaps/stipple.xbm"
 
 #else
-#ifndef VMS
 
 #include <X11/bitmaps/dimple1>
 #include <X11/bitmaps/dimple3>
@@ -50,23 +65,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 +91,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 +107,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. */