merge latest (4.3.99.16) from XFree86 (vendor) branch

Xi/grabdev.h

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.1 1996/04/15 11:18:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/grabdev.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,37 +29,29 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 int
 SProcXGrabDevice(
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */
-#endif
 	);
 
 int
 ProcXGrabDevice(
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */
-#endif
 	);
 
 int
 CreateMaskFromList (
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */,
 	XEventClass *          /* list */,
 	int                    /* count */,
 	struct tmask           /* mask */[],
 	DeviceIntPtr           /* dev */,
 	int                    /* req */
-#endif
 	);
 
 void
 SRepXGrabDevice (
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */,
 	int                    /* size */,
 	xGrabDeviceReply *     /* rep */
-#endif
 	);
 
 #endif /* GRABDEV_H */