Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 182 insertions, 221 deletions

diff --git a/xorg-server/include/exevents.h b/xorg-server/include/exevents.h
index fb2ef274c..feea170d2 100644
--- a/xorg-server/include/exevents.h
+++ b/xorg-server/include/exevents.h
@@ -41,313 +41,274 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * Scroll flags for ::SetScrollValuator.
  */
 enum ScrollFlags {
-    SCROLL_FLAG_NONE            = 0,
+    SCROLL_FLAG_NONE = 0,
     /**
      * Do not emulate legacy button events for valuator events on this axis.
      */
-    SCROLL_FLAG_DONT_EMULATE    = (1 << 1),
+    SCROLL_FLAG_DONT_EMULATE = (1 << 1),
     /**
      * This axis is the preferred axis for valuator emulation for this axis'
      * scroll type.
      */
-    SCROLL_FLAG_PREFERRED       = (1 << 2)
+    SCROLL_FLAG_PREFERRED = (1 << 2)
 };
 
-extern _X_EXPORT int InitProximityClassDeviceStruct(
-	DeviceIntPtr           /* dev */);
-
-extern _X_EXPORT Bool InitValuatorAxisStruct(
-	DeviceIntPtr           /* dev */,
-	int                    /* axnum */,
-	Atom                   /* label */,
-	int                    /* minval */,
-	int                    /* maxval */,
-	int                    /* resolution */,
-	int                    /* min_res */,
-	int                    /* max_res */,
-	int                    /* mode */);
-
-extern _X_EXPORT Bool SetScrollValuator(
-	DeviceIntPtr           /* dev */,
-	int                    /* axnum */,
-	enum ScrollType        /* type */,
-	double                 /* increment */,
-	int                    /* flags */);
+extern _X_EXPORT int InitProximityClassDeviceStruct(DeviceIntPtr /* dev */ );
+
+extern _X_EXPORT Bool InitValuatorAxisStruct(DeviceIntPtr /* dev */ ,
+                                             int /* axnum */ ,
+                                             Atom /* label */ ,
+                                             int /* minval */ ,
+                                             int /* maxval */ ,
+                                             int /* resolution */ ,
+                                             int /* min_res */ ,
+                                             int /* max_res */ ,
+                                             int /* mode */ );
+
+extern _X_EXPORT Bool SetScrollValuator(DeviceIntPtr /* dev */ ,
+                                        int /* axnum */ ,
+                                        enum ScrollType /* type */ ,
+                                        double /* increment */ ,
+                                        int /* flags */ );
 
 /* Input device properties */
-extern _X_EXPORT void XIDeleteAllDeviceProperties(
-        DeviceIntPtr            /* device */
-);
-
-extern _X_EXPORT int XIDeleteDeviceProperty(
-        DeviceIntPtr            /* device */,
-        Atom                    /* property */,
-        Bool                    /* fromClient */
-);
-
-extern _X_EXPORT int XIChangeDeviceProperty(
-        DeviceIntPtr            /* dev */,
-        Atom                    /* property */,
-        Atom                    /* type */,
-        int                     /* format*/,
-        int                     /* mode*/,
-        unsigned long           /* len*/,
-        const void*             /* value*/,
-        Bool                    /* sendevent*/
-        );
-
-extern _X_EXPORT int XIGetDeviceProperty(
-        DeviceIntPtr            /* dev */,
-        Atom                    /* property */,
-        XIPropertyValuePtr*     /* value */
-);
-
-extern _X_EXPORT int XISetDevicePropertyDeletable(
-        DeviceIntPtr            /* dev */,
-        Atom                    /* property */,
-        Bool                    /* deletable */
-);
-
-extern _X_EXPORT long XIRegisterPropertyHandler(
-        DeviceIntPtr         dev,
-        int (*SetProperty) (DeviceIntPtr dev,
-                            Atom property,
-                            XIPropertyValuePtr prop,
-                            BOOL checkonly),
-        int (*GetProperty) (DeviceIntPtr dev,
-                            Atom property),
-        int (*DeleteProperty) (DeviceIntPtr dev,
-                               Atom property)
-);
-
-extern _X_EXPORT void XIUnregisterPropertyHandler(
-        DeviceIntPtr          dev,
-        long                  id
-);
-
-extern _X_EXPORT Atom XIGetKnownProperty(
-        const char*           name
-);
+extern _X_EXPORT void XIDeleteAllDeviceProperties(DeviceIntPtr  /* device */
+    );
+
+extern _X_EXPORT int XIDeleteDeviceProperty(DeviceIntPtr /* device */ ,
+                                            Atom /* property */ ,
+                                            Bool        /* fromClient */
+    );
+
+extern _X_EXPORT int XIChangeDeviceProperty(DeviceIntPtr /* dev */ ,
+                                            Atom /* property */ ,
+                                            Atom /* type */ ,
+                                            int /* format */ ,
+                                            int /* mode */ ,
+                                            unsigned long /* len */ ,
+                                            const void * /* value */ ,
+                                            Bool        /* sendevent */
+    );
+
+extern _X_EXPORT int XIGetDeviceProperty(DeviceIntPtr /* dev */ ,
+                                         Atom /* property */ ,
+                                         XIPropertyValuePtr *   /* value */
+    );
+
+extern _X_EXPORT int XISetDevicePropertyDeletable(DeviceIntPtr /* dev */ ,
+                                                  Atom /* property */ ,
+                                                  Bool  /* deletable */
+    );
+
+extern _X_EXPORT long XIRegisterPropertyHandler(DeviceIntPtr dev,
+                                                int (*SetProperty) (DeviceIntPtr
+                                                                    dev,
+                                                                    Atom
+                                                                    property,
+                                                                    XIPropertyValuePtr
+                                                                    prop,
+                                                                    BOOL
+                                                                    checkonly),
+                                                int (*GetProperty) (DeviceIntPtr
+                                                                    dev,
+                                                                    Atom
+                                                                    property),
+                                                int (*DeleteProperty)
+                                                (DeviceIntPtr dev,
+                                                 Atom property)
+    );
+
+extern _X_EXPORT void XIUnregisterPropertyHandler(DeviceIntPtr dev, long id);
+
+extern _X_EXPORT Atom XIGetKnownProperty(const char *name);
 
 extern _X_EXPORT DeviceIntPtr XIGetDevice(xEvent *ev);
 
-extern _X_EXPORT int XIPropToInt(
-        XIPropertyValuePtr val,
-        int *nelem_return,
-        int **buf_return
-);
+extern _X_EXPORT int XIPropToInt(XIPropertyValuePtr val,
+                                 int *nelem_return, int **buf_return);
 
-extern _X_EXPORT int XIPropToFloat(
-        XIPropertyValuePtr val,
-        int *nelem_return,
-        float **buf_return
-);
+extern _X_EXPORT int XIPropToFloat(XIPropertyValuePtr val,
+                                   int *nelem_return, float **buf_return);
 
 /****************************************************************************
  *                      End of driver interface                             *
  ****************************************************************************/
 
-
 /**
  * Attached to the devPrivates of each client. Specifies the version number as
  * supported by the client.
  */
 typedef struct _XIClientRec {
-        int major_version;
-        int minor_version;
+    int major_version;
+    int minor_version;
 } XIClientRec, *XIClientPtr;
 
-
 typedef struct _GrabParameters {
-    int                 grabtype;               /* CORE, etc. */
-    unsigned int        ownerEvents;
-    unsigned int        this_device_mode;
-    unsigned int        other_devices_mode;
-    Window              grabWindow;
-    Window              confineTo;
-    Cursor              cursor;
-    unsigned int        modifiers;
+    int grabtype;               /* CORE, etc. */
+    unsigned int ownerEvents;
+    unsigned int this_device_mode;
+    unsigned int other_devices_mode;
+    Window grabWindow;
+    Window confineTo;
+    Cursor cursor;
+    unsigned int modifiers;
 } GrabParameters;
 
-
 extern int
-UpdateDeviceState (
-	DeviceIntPtr           /* device */,
-	DeviceEvent*           /*  xE    */);
+ UpdateDeviceState(DeviceIntPtr /* device */ ,
+                   DeviceEvent * /*  xE    */ );
 
 extern void
-ProcessOtherEvent (
-	InternalEvent*         /* ev */,
-	DeviceIntPtr           /* other */);
+ ProcessOtherEvent(InternalEvent * /* ev */ ,
+                   DeviceIntPtr /* other */ );
 
 extern void
-DeviceFocusEvent(
-	DeviceIntPtr           /* dev */,
-	int                    /* type */,
-	int                    /* mode */,
-	int                    /* detail */,
-	WindowPtr              /* pWin */);
+ DeviceFocusEvent(DeviceIntPtr /* dev */ ,
+                  int /* type */ ,
+                  int /* mode */ ,
+                  int /* detail */ ,
+                  WindowPtr /* pWin */ );
 
 extern int
-CheckGrabValues(
-        ClientPtr              /* client */,
-        GrabParameters*        /* param */);
+ CheckGrabValues(ClientPtr /* client */ ,
+                 GrabParameters * /* param */ );
 
 extern int
-GrabButton(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	DeviceIntPtr           /* modifier_device */,
-	int                    /* button */,
-        GrabParameters*        /* param */,
-        enum InputLevel        /* grabtype */,
-	GrabMask*              /* eventMask */);
+ GrabButton(ClientPtr /* client */ ,
+            DeviceIntPtr /* dev */ ,
+            DeviceIntPtr /* modifier_device */ ,
+            int /* button */ ,
+            GrabParameters * /* param */ ,
+            enum InputLevel /* grabtype */ ,
+            GrabMask * /* eventMask */ );
 
 extern int
-GrabKey(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	DeviceIntPtr           /* modifier_device */,
-	int                    /* key */,
-        GrabParameters*        /* param */,
-        enum InputLevel        /* grabtype */,
-	GrabMask*              /* eventMask */);
+ GrabKey(ClientPtr /* client */ ,
+         DeviceIntPtr /* dev */ ,
+         DeviceIntPtr /* modifier_device */ ,
+         int /* key */ ,
+         GrabParameters * /* param */ ,
+         enum InputLevel /* grabtype */ ,
+         GrabMask * /* eventMask */ );
 
 extern int
-GrabWindow(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	int                    /* type */,
-	GrabParameters*        /* param */,
-	GrabMask*              /* eventMask */);
+ GrabWindow(ClientPtr /* client */ ,
+            DeviceIntPtr /* dev */ ,
+            int /* type */ ,
+            GrabParameters * /* param */ ,
+            GrabMask * /* eventMask */ );
 
 extern int
-GrabTouch(
-       ClientPtr              /* client */,
-       DeviceIntPtr           /* dev */,
-       DeviceIntPtr           /* mod_dev */,
-       GrabParameters*        /* param */,
-       GrabMask*              /* eventMask */);
+ GrabTouch(ClientPtr /* client */ ,
+           DeviceIntPtr /* dev */ ,
+           DeviceIntPtr /* mod_dev */ ,
+           GrabParameters * /* param */ ,
+           GrabMask * /* eventMask */ );
 
 extern int
-SelectForWindow(
-	DeviceIntPtr           /* dev */,
-	WindowPtr              /* pWin */,
-	ClientPtr              /* client */,
-	Mask                   /* mask */,
-	Mask                   /* exclusivemasks */);
+ SelectForWindow(DeviceIntPtr /* dev */ ,
+                 WindowPtr /* pWin */ ,
+                 ClientPtr /* client */ ,
+                 Mask /* mask */ ,
+                 Mask /* exclusivemasks */ );
 
 extern int
-AddExtensionClient (
-	WindowPtr              /* pWin */,
-	ClientPtr              /* client */,
-	Mask                   /* mask */,
-	int                    /* mskidx */);
+ AddExtensionClient(WindowPtr /* pWin */ ,
+                    ClientPtr /* client */ ,
+                    Mask /* mask */ ,
+                    int /* mskidx */ );
 
 extern void
-RecalculateDeviceDeliverableEvents(
-	WindowPtr              /* pWin */);
+ RecalculateDeviceDeliverableEvents(WindowPtr /* pWin */ );
 
 extern int
-InputClientGone(
-	WindowPtr              /* pWin */,
-	XID                    /* id */);
+ InputClientGone(WindowPtr /* pWin */ ,
+                 XID /* id */ );
 
 extern void
-WindowGone(
-	WindowPtr              /* win */);
+ WindowGone(WindowPtr /* win */ );
 
 extern int
-SendEvent (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* d */,
-	Window                 /* dest */,
-	Bool                   /* propagate */,
-	xEvent *               /* ev */,
-	Mask                   /* mask */,
-	int                    /* count */);
+ SendEvent(ClientPtr /* client */ ,
+           DeviceIntPtr /* d */ ,
+           Window /* dest */ ,
+           Bool /* propagate */ ,
+           xEvent * /* ev */ ,
+           Mask /* mask */ ,
+           int /* count */ );
 
 extern int
-SetButtonMapping (
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	int                    /* nElts */,
-	BYTE *                 /* map */);
+ SetButtonMapping(ClientPtr /* client */ ,
+                  DeviceIntPtr /* dev */ ,
+                  int /* nElts */ ,
+                  BYTE * /* map */ );
 
 extern int
-ChangeKeyMapping(
-	ClientPtr              /* client */,
-	DeviceIntPtr           /* dev */,
-	unsigned               /* len */,
-	int                    /* type */,
-	KeyCode                /* firstKeyCode */,
-	CARD8                  /* keyCodes */,
-	CARD8                  /* keySymsPerKeyCode */,
-	KeySym *               /* map */);
+ ChangeKeyMapping(ClientPtr /* client */ ,
+                  DeviceIntPtr /* dev */ ,
+                  unsigned /* len */ ,
+                  int /* type */ ,
+                  KeyCode /* firstKeyCode */ ,
+                  CARD8 /* keyCodes */ ,
+                  CARD8 /* keySymsPerKeyCode */ ,
+                  KeySym * /* map */ );
 
 extern void
-DeleteWindowFromAnyExtEvents(
-	WindowPtr              /* pWin */,
-	Bool                   /* freeResources */);
+ DeleteWindowFromAnyExtEvents(WindowPtr /* pWin */ ,
+                              Bool /* freeResources */ );
 
 extern int
-MaybeSendDeviceMotionNotifyHint (
-	deviceKeyButtonPointer * /* pEvents */,
-	Mask                   /* mask */);
+ MaybeSendDeviceMotionNotifyHint(deviceKeyButtonPointer * /* pEvents */ ,
+                                 Mask /* mask */ );
 
 extern void
-CheckDeviceGrabAndHintWindow (
-	WindowPtr              /* pWin */,
-	int                    /* type */,
-	deviceKeyButtonPointer * /* xE */,
-	GrabPtr                /* grab */,
-	ClientPtr              /* client */,
-	Mask                   /* deliveryMask */);
+ CheckDeviceGrabAndHintWindow(WindowPtr /* pWin */ ,
+                              int /* type */ ,
+                              deviceKeyButtonPointer * /* xE */ ,
+                              GrabPtr /* grab */ ,
+                              ClientPtr /* client */ ,
+                              Mask /* deliveryMask */ );
 
 extern void
-MaybeStopDeviceHint(
-	DeviceIntPtr           /* dev */,
-	ClientPtr              /* client */);
+ MaybeStopDeviceHint(DeviceIntPtr /* dev */ ,
+                     ClientPtr /* client */ );
 
 extern int
-DeviceEventSuppressForWindow(
-	WindowPtr              /* pWin */,
-	ClientPtr              /* client */,
-	Mask                   /* mask */,
-	int                    /* maskndx */);
+ DeviceEventSuppressForWindow(WindowPtr /* pWin */ ,
+                              ClientPtr /* client */ ,
+                              Mask /* mask */ ,
+                              int /* maskndx */ );
 
 extern void
-SendEventToAllWindows(
-        DeviceIntPtr           /* dev */,
-        Mask                   /* mask */,
-        xEvent *               /* ev */,
-        int                    /* count */);
+ SendEventToAllWindows(DeviceIntPtr /* dev */ ,
+                       Mask /* mask */ ,
+                       xEvent * /* ev */ ,
+                       int /* count */ );
 
 extern void
-TouchRejected(
-        DeviceIntPtr           /* sourcedev */,
-        TouchPointInfoPtr      /* ti */,
-        XID                    /* resource */,
-        TouchOwnershipEvent *  /* ev */);
+ TouchRejected(DeviceIntPtr /* sourcedev */ ,
+               TouchPointInfoPtr /* ti */ ,
+               XID /* resource */ ,
+               TouchOwnershipEvent * /* ev */ );
 
-extern _X_HIDDEN void XI2EventSwap(
-        xGenericEvent  *              /* from */,
-        xGenericEvent  *              /* to */);
+extern _X_HIDDEN void XI2EventSwap(xGenericEvent * /* from */ ,
+                                   xGenericEvent * /* to */ );
 
 /* For an event such as MappingNotify which affects client interpretation
  * of input events sent by device dev, should we notify the client, or
  * would it merely be irrelevant and confusing? */
 extern int
-XIShouldNotify(ClientPtr client, DeviceIntPtr dev);
+ XIShouldNotify(ClientPtr client, DeviceIntPtr dev);
 
 extern void
-XISendDeviceChangedEvent(DeviceIntPtr device, DeviceChangedEvent *dce);
+ XISendDeviceChangedEvent(DeviceIntPtr device, DeviceChangedEvent *dce);
 
 extern int
+
 XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
-                           unsigned int len, unsigned char* mask);
+               unsigned int len, unsigned char *mask);
 
 extern int
-XICheckInvalidMaskBits(ClientPtr client, unsigned char *mask, int len);
+ XICheckInvalidMaskBits(ClientPtr client, unsigned char *mask, int len);
 
-#endif /* EXEVENTS_H */
+#endif                          /* EXEVENTS_H */