merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 16 insertions, 4 deletions

diff --git a/restart.h b/restart.h
index 6dcf553..a1abc89 100644
--- a/restart.h
+++ b/restart.h
@@ -23,8 +23,20 @@ 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/xsm/restart.h,v 1.6 2001/12/14 20:02:27 dawes Exp $ */
 
-extern void StartDefaultApps ();
-extern void StartNonSessionAwareApps ();
-extern Status Restart ();
-extern void Clone ();
+#ifndef _RESTART_H_
+#define _RESTART_H_
+
+#include "xsm.h"
+
+extern Bool CheckIsManager(char *program);
+extern void GetRestartInfo(char *restart_service_prop, char *client_host_name,
+			   Bool *run_local, char **restart_protocol, 
+			   char **restart_machine);
+extern Status Restart(int flag);
+extern void Clone(ClientRec *client, Bool useSavedState);
+extern void StartDefaultApps(void);
+extern void StartNonSessionAwareApps(void);
+
+#endif