merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 6 insertions, 9 deletions

diff --git a/editres.c b/editres.c
index 93fad17..3a2c9b9 100644
--- a/editres.c
+++ b/editres.c
@@ -23,8 +23,10 @@ Except as contained in this notice, the name of The Open Group shall not be
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
  */
+/* $XFree86: xc/programs/editres/editres.c,v 1.7 2001/12/14 20:00:42 dawes Exp $ */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Intrinsic.h>
 #include <X11/StringDefs.h>
 #include <X11/Xaw/Cardinals.h>	
@@ -49,7 +51,7 @@ char *global_effective_toolkit = "xt";
 
 int global_error_code;
 unsigned long global_serial_num;
-int (*global_old_error_handler)();
+int (*global_old_error_handler)(Display *, XErrorEvent *);
 
 Boolean global_resource_box_up = FALSE;
 TreeInfo *global_tree_info = NULL;
@@ -60,14 +62,8 @@ Widget global_paned = NULL;		/* named after toolkit */
 Widget global_toplevel;
 AppResources global_resources;
 
-/*
- * external function definitions.
- */
-
-extern void InternAtoms(), SetMessage(), BuildWidgetTree();
-extern void SetApplicationActions();
 
-static void Syntax();
+static void Syntax ( XtAppContext app_con, char *call );
 
 String fallback_resources[] = { 
     NULL,
@@ -90,7 +86,7 @@ static XtResource editres_resources[] = {
 
 Atom wm_delete_window;
 
-void
+int
 main(argc, argv)
 int argc;
 char **argv;
@@ -133,6 +129,7 @@ char **argv;
 			    XtWindow(global_toplevel),
                             &wm_delete_window, 1);
     XtAppMainLoop(app_con);
+    exit(0);
 }
 
 /*	Function Name: Syntax