mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-28 21:33:09 +00:00
Merge branch 'master' into mpx
Conflicts: Xi/closedev.c Xi/exevents.c Xi/extinit.c Xi/listdev.c dix/window.c hw/xfree86/common/xf86Xinput.c include/extinit.h mi/mipointer.c
This commit is contained in:
commit
e8777a91f3
280 changed files with 4649 additions and 5825 deletions
|
|
@ -59,9 +59,9 @@ from the author.
|
|||
*/
|
||||
|
||||
int
|
||||
SProcXWarpDevicePointer(register ClientPtr client)
|
||||
SProcXWarpDevicePointer(ClientPtr client)
|
||||
{
|
||||
register char n;
|
||||
char n;
|
||||
|
||||
REQUEST(xWarpDevicePointerReq);
|
||||
swaps(&stuff->length, n);
|
||||
|
|
@ -69,7 +69,7 @@ SProcXWarpDevicePointer(register ClientPtr client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcXWarpDevicePointer(register ClientPtr client)
|
||||
ProcXWarpDevicePointer(ClientPtr client)
|
||||
{
|
||||
int err;
|
||||
int x, y;
|
||||
|
|
|
|||
Loading…
Reference in a new issue