merge XFree86 4.3.0.1 to -CURRENT

1 files changed, 9 insertions, 1 deletions

diff --git a/xtwatch.h b/xtwatch.h
index 4ee3b00..8ad0b04 100644
--- a/xtwatch.h
+++ b/xtwatch.h
@@ -23,5 +23,13 @@ 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/xtwatch.h,v 1.6 2001/12/14 20:02:28 dawes Exp $ */
 
-extern Status InitWatchProcs ();
+#ifndef _XTWATCH_H_
+#define _XTWATCH_H_
+
+#include <X11/Intrinsic.h>
+
+extern Status InitWatchProcs(XtAppContext appContext);
+
+#endif