mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-31 02:50:00 +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
|
|
@ -60,9 +60,9 @@ from the author.
|
|||
*
|
||||
*/
|
||||
|
||||
int SProcXChangePointerKeyboardPairing(register ClientPtr client)
|
||||
int SProcXChangePointerKeyboardPairing(ClientPtr client)
|
||||
{
|
||||
register char n;
|
||||
char n;
|
||||
|
||||
REQUEST(xChangePointerKeyboardPairingReq);
|
||||
swaps(&stuff->length, n);
|
||||
|
|
@ -70,7 +70,7 @@ int SProcXChangePointerKeyboardPairing(register ClientPtr client)
|
|||
}
|
||||
|
||||
int
|
||||
ProcXChangePointerKeyboardPairing(register ClientPtr client)
|
||||
ProcXChangePointerKeyboardPairing(ClientPtr client)
|
||||
{
|
||||
DeviceIntPtr pPointer, pKeyboard;
|
||||
int ret;
|
||||
|
|
|
|||
Loading…
Reference in a new issue