diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-01 20:12:44 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2018-11-01 20:12:44 +0100 |
| commit | 122db3fde2b934df206567abc0c8b431962ce4b3 (patch) | |
| tree | 5435567977fca83801096f971ded62b129c65f73 /nx-X11/programs/Xserver/Xi/extinit.c | |
| parent | 70b49467c41e51eb11a50e4cbe3652246bf21140 (diff) | |
| parent | 266c3d68d5abae1de80e807dbbe3252b34c4a04f (diff) | |
| download | nx-libs-122db3fde2b934df206567abc0c8b431962ce4b3.tar.gz nx-libs-122db3fde2b934df206567abc0c8b431962ce4b3.tar.bz2 nx-libs-122db3fde2b934df206567abc0c8b431962ce4b3.zip | |
Merge branch 'uli42-pr/Xi-1.2.0' into 3.6.x
Attributes GH PR #734: https://github.com/ArcticaProject/nx-libs/pull/734
Diffstat (limited to 'nx-X11/programs/Xserver/Xi/extinit.c')
| -rw-r--r-- | nx-X11/programs/Xserver/Xi/extinit.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/Xi/extinit.c b/nx-X11/programs/Xserver/Xi/extinit.c index a50552cfe..adf69b00b 100644 --- a/nx-X11/programs/Xserver/Xi/extinit.c +++ b/nx-X11/programs/Xserver/Xi/extinit.c @@ -1,4 +1,3 @@ - /************************************************************ Copyright 1989, 1998 The Open Group @@ -201,8 +200,8 @@ Mask PropagateMask[MAX_DEVICES]; * */ -static XExtensionVersion thisversion = - {XI_Present, +static XExtensionVersion thisversion = + {XI_Present, SERVER_XI_MAJOR_VERSION, SERVER_XI_MINOR_VERSION, }; @@ -576,8 +575,7 @@ SEventDeviceValuator(deviceValuator * from, deviceValuator * to) swaps(&to->sequenceNumber); swaps(&to->device_state); ip = &to->valuator0; - for (i=0; i<6; i++) - { + for (i = 0; i < 6; i++) { swapl((ip + i)); /* macro - braces are required */ } } @@ -822,7 +820,7 @@ IResetProc(ExtensionEntry * unused) * */ - void +void AssignTypeAndName(DeviceIntPtr dev, Atom type, char *name) { dev->type = type; |