merge latest (4.3.99.16) from XFree86 (vendor) branch

Xi/chgptr.h

@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.1 1996/04/15 11:18:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/Xi/chgptr.h,v 3.2 2003/11/17 22:20:29 dawes Exp $ */
 /************************************************************
 
 Copyright 1996 by Thomas E. Dickey <dickey@clark.net>
@@ -29,53 +29,41 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 int
 SProcXChangePointerDevice(
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */
-#endif
 	);
 
 int
 ProcXChangePointerDevice (
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */
-#endif
 	);
 
 void
 DeleteFocusClassDeviceStruct(
-#if NeedFunctionPrototypes
 	DeviceIntPtr           /* dev */
-#endif
 	);
 
 void
 SendEventToAllWindows (
-#if NeedFunctionPrototypes
 	DeviceIntPtr           /* dev */,
 	Mask                   /* mask */,
 	xEvent *               /* ev */,
 	int                    /* count */
-#endif
 	);
 
 void
 FindInterestedChildren ( /* FIXME: could be static? */
-#if NeedFunctionPrototypes
 	DeviceIntPtr           /* dev */,
 	WindowPtr              /* p1 */,
 	Mask                   /* mask */,
 	xEvent *               /* ev */,
 	int                    /* count */
-#endif
 	);
 
 void
 SRepXChangePointerDevice (
-#if NeedFunctionPrototypes
 	ClientPtr              /* client */,
 	int                    /* size */,
 	xChangePointerDeviceReply * /* rep */
-#endif
 	);
 
 #endif /* CHGPTR_H */