merge latest (4.3.99.16) from XFree86 (vendor) branch

include/extinit.h

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.2 2001/08/01 00:44:58 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/include/extinit.h,v 3.3 2003/11/17 22:20:43 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -35,178 +35,132 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 void
 XInputExtensionInit(
-#if NeedFunctionPrototypes
 	void
-#endif
 	);
 
 
 int
 ProcIDispatch (
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */
-#endif
 	);
 
 int
 SProcIDispatch(
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */
-#endif
 	);
 
 void
 SReplyIDispatch (
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */,
 	int                    /* len */,
 	xGrabDeviceReply *     /* rep */
-#endif
 	);
 
 void
 SEventIDispatch (
-#if NeedFunctionPrototypes
 	xEvent *               /* from */,
 	xEvent *               /* to */
-#endif
 	);
 
 void
 SEventDeviceValuator (
-#if NeedFunctionPrototypes
 	deviceValuator *       /* from */,
 	deviceValuator *       /* to */
-#endif
 	);
 
 void
 SEventFocus (
-#if NeedFunctionPrototypes
 	deviceFocus *          /* from */,
 	deviceFocus *          /* to */
-#endif
 	);
 
 void
 SDeviceStateNotifyEvent (
-#if NeedFunctionPrototypes
 	deviceStateNotify *    /* from */,
 	deviceStateNotify *    /* to */
-#endif
 	);
 
 void
 SDeviceKeyStateNotifyEvent (
-#if NeedFunctionPrototypes
 	deviceKeyStateNotify * /* from */,
 	deviceKeyStateNotify * /* to */
-#endif
 	);
 
 void
 SDeviceButtonStateNotifyEvent (
-#if NeedFunctionPrototypes
 	deviceButtonStateNotify * /* from */,
 	deviceButtonStateNotify * /* to */
-#endif
 	);
 
 void
 SChangeDeviceNotifyEvent (
-#if NeedFunctionPrototypes
 	changeDeviceNotify *   /* from */,
 	changeDeviceNotify *   /* to */
-#endif
 	);
 
 void
 SDeviceMappingNotifyEvent (
-#if NeedFunctionPrototypes
 	deviceMappingNotify *  /* from */,
 	deviceMappingNotify *  /* to */
-#endif
 	);
 
 void
 FixExtensionEvents (
-#if NeedFunctionPrototypes
 	ExtensionEntry 	*      /* extEntry */
-#endif
 	);
 
 void
 RestoreExtensionEvents (
-#if NeedFunctionPrototypes
 	void
-#endif
 	);
 
 void
 IResetProc(
-#if NeedFunctionPrototypes
 	ExtensionEntry *       /* unused */
-#endif
 	);
 
 void
 AssignTypeAndName (
-#if NeedFunctionPrototypes
 	DeviceIntPtr           /* dev */,
 	Atom                   /* type */,
 	char *                 /* name */
-#endif
 	);
 
 void
 MakeDeviceTypeAtoms (
-#if NeedFunctionPrototypes
 	void
-#endif
 );
 
 DeviceIntPtr
 LookupDeviceIntRec (
-#if NeedFunctionPrototypes
 	CARD8                  /* id */
-#endif
 	);
 
 void
 SetExclusiveAccess (
-#if NeedFunctionPrototypes
 	Mask                   /* mask */
-#endif
 	);
 
 void
 AllowPropagateSuppress (
-#if NeedFunctionPrototypes
 	Mask                   /* mask */
-#endif
 	);
 
 Mask
 GetNextExtEventMask (
-#if NeedFunctionPrototypes
 	void
-#endif
 );
 
 void
 SetMaskForExtEvent(
-#if NeedFunctionPrototypes
 	Mask                   /* mask */,
 	int                    /* event */
-#endif
 	);
 
 void
 SetEventInfo(
-#if NeedFunctionPrototypes
 	Mask                   /* mask */,
 	int                    /* constant */
-#endif
 	);
 
 #endif /* EXTINIT_H */