XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks

diff --git a/XInput.h b/XInput.h
index 83aba0c..0abd5a7 100644 (file)
--- a/XInput.h
+++ b/XInput.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/include/extensions/XInput.h,v 1.3 2001/12/14 19:53:28 dawes Exp $ */
+/* $XFree86: xc/include/extensions/XInput.h,v 1.4 2003/11/17 22:20:02 dawes Exp $ */
 
 /* Definitions used by the library and client */
 
@@ -833,23 +833,18 @@ typedef struct {
 _XFUNCPROTOBEGIN
 
 extern int     XChangeKeyboardDevice(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */
-#endif
 );
 
 extern int     XChangePointerDevice(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int                        /* xaxis */,
     int                        /* yaxis */
-#endif
 );
 
 extern int     XGrabDevice(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     Window             /* grab_window */,
@@ -859,19 +854,15 @@ extern int        XGrabDevice(
     int                        /* this_device_mode */,
     int                        /* other_devices_mode */,
     Time               /* time */
-#endif
 );
 
 extern int     XUngrabDevice(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     Time               /* time */
-#endif
 );
 
 extern int     XGrabDeviceKey(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     unsigned int       /* key */,
@@ -883,22 +874,18 @@ extern int        XGrabDeviceKey(
     XEventClass*       /* event_list */,
     int                        /* this_device_mode */,
     int                        /* other_devices_mode */
-#endif
 );
 
 extern int     XUngrabDeviceKey(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     unsigned int       /* key */,
     unsigned int       /* modifiers */,
     XDevice*           /* modifier_dev */,
     Window             /* grab_window */
-#endif
 );
 
 extern int     XGrabDeviceButton(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     unsigned int       /* button */,
@@ -910,84 +897,66 @@ extern int        XGrabDeviceButton(
     XEventClass*       /* event_list */,
     int                        /* this_device_mode */,
     int                        /* other_devices_mode */
-#endif
 );
 
 extern int     XUngrabDeviceButton(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     unsigned int       /* button */,
     unsigned int       /* modifiers */,
     XDevice*           /* modifier_dev */,
     Window             /* grab_window */
-#endif
 );
 
 extern int     XAllowDeviceEvents(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int                        /* event_mode */,
     Time               /* time */
-#endif
 );
 
 extern int     XGetDeviceFocus(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     Window*            /* focus */,
     int*               /* revert_to */,
     Time*              /* time */
-#endif
 );
 
 extern int     XSetDeviceFocus(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     Window             /* focus */,
     int                        /* revert_to */,
     Time               /* time */
-#endif
 );
 
 extern XFeedbackState  *XGetFeedbackControl(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int*               /* num_feedbacks */
-#endif
 );
 
 extern void    XFreeFeedbackList(
-#if NeedFunctionPrototypes
     XFeedbackState*    /* list */
-#endif
 );
 
 extern int     XChangeFeedbackControl(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     unsigned long      /* mask */,
     XFeedbackControl*  /* f */
-#endif
 );
 
 extern int     XDeviceBell(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     XID                        /* feedbackclass */,
     XID                        /* feedbackid */,
     int                        /* percent */
-#endif
 );
 
 extern KeySym  *XGetDeviceKeyMapping(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
 #if NeedWidePrototypes
@@ -997,175 +966,133 @@ extern KeySym   *XGetDeviceKeyMapping(
 #endif
     int                        /* keycount */,
     int*               /* syms_per_code */
-#endif
 );
 
 extern int     XChangeDeviceKeyMapping(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int                        /* first */,
     int                        /* syms_per_code */,
     KeySym*            /* keysyms */,
     int                        /* count */
-#endif
 );
 
 extern XModifierKeymap *XGetDeviceModifierMapping(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */
-#endif
 );
 
 extern int     XSetDeviceModifierMapping(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     XModifierKeymap*   /* modmap */
-#endif
 );
 
 extern int     XSetDeviceButtonMapping(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     unsigned char*     /* map[] */,
     int                        /* nmap */
-#endif
 );
 
 extern int     XGetDeviceButtonMapping(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     unsigned char*     /* map[] */,
     unsigned int       /* nmap */
-#endif
 );
 
 extern XDeviceState    *XQueryDeviceState(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */
-#endif
 );
 
 extern void    XFreeDeviceState(
-#if NeedFunctionPrototypes
     XDeviceState*      /* list */
-#endif
 );
 
 extern XExtensionVersion       *XGetExtensionVersion(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     _Xconst char*      /* name */
-#endif
 );
 
 extern XDeviceInfo     *XListInputDevices(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     int*               /* ndevices */
-#endif
 );
 
 extern void    XFreeDeviceList(
-#if NeedFunctionPrototypes
     XDeviceInfo*       /* list */
-#endif
 );
 
 extern XDevice *XOpenDevice(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XID                        /* id */
-#endif
 );
 
 extern int     XCloseDevice(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */
-#endif
 );
 
 extern int     XSetDeviceMode(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int                        /* mode */
-#endif
 );
 
 extern int     XSetDeviceValuators(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int*               /* valuators */,
     int                        /* first_valuator */,
     int                        /* num_valuators */
-#endif
 );
 
 extern XDeviceControl  *XGetDeviceControl(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int                        /* control */
-#endif
 );
 
 extern int     XChangeDeviceControl(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     int                        /* control */,
     XDeviceControl*    /* d */
-#endif
 );
 
 extern int     XSelectExtensionEvent(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     Window             /* w */,
     XEventClass*       /* event_list */,
     int                        /* count */
-#endif
 );
 
 extern int XGetSelectedExtensionEvents(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     Window             /* w */,
     int*               /* this_client_count */,
     XEventClass**      /* this_client_list */,
     int*               /* all_clients_count */,
     XEventClass**      /* all_clients_list */
-#endif
 );
 
 extern int     XChangeDeviceDontPropagateList(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     Window             /* window */,
     int                        /* count */,
     XEventClass*       /* events */,
     int                        /* mode */
-#endif
 );
 
 extern XEventClass     *XGetDeviceDontPropagateList(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     Window             /* window */,
     int*               /* count */
-#endif
 );
 
 extern Status  XSendExtensionEvent(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     Window             /* dest */,
@@ -1173,11 +1100,9 @@ extern Status    XSendExtensionEvent(
     int                        /* count */,
     XEventClass*       /* list */,
     XEvent*            /* event */
-#endif
 );
 
 extern XDeviceTimeCoord        *XGetDeviceMotionEvents(
-#if NeedFunctionPrototypes
     Display*           /* display */,
     XDevice*           /* device */,
     Time               /* start */,
@@ -1185,19 +1110,14 @@ extern XDeviceTimeCoord *XGetDeviceMotionEvents(
     int*               /* nEvents */,
     int*               /* mode */,
     int*               /* axis_count */
-#endif
 );
 
 extern void    XFreeDeviceMotionEvents(
-#if NeedFunctionPrototypes
     XDeviceTimeCoord*  /* events */
-#endif
 );
 
 extern void    XFreeDeviceControl(
-#if NeedFunctionPrototypes
     XDeviceControl*    /* control */
-#endif
 );
 
 _XFUNCPROTOEND