From 266c3d68d5abae1de80e807dbbe3252b34c4a04f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 1 Nov 2018 15:41:34 +0100 Subject: Lift Xi to 1.3.0.0 (identical to 1.2.0) --- nx-X11/programs/Xserver/Xi/extinit.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'nx-X11/programs/Xserver/Xi/extinit.c') 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; -- cgit v1.2.3