diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-21 09:28:15 +0200 |
| commit | d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c (patch) | |
| tree | db56fe01d61a824e4bd975cbf8603b11e9c5ecdf /xorg-server/dix/devices.c | |
| parent | d2dacc6bc44f7dc245dee6e66723013afb49cfb5 (diff) | |
| parent | f543ceaca6820260f15a4eff86938214cf43c7d2 (diff) | |
| download | vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.gz vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.tar.bz2 vcxsrv-d4b066581bc9a4bf7b0a5ffa11ff0adb47d2075c.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/dix/devices.c')
| -rw-r--r-- | xorg-server/dix/devices.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/xorg-server/dix/devices.c b/xorg-server/dix/devices.c index 21179ee59..7f70ca69a 100644 --- a/xorg-server/dix/devices.c +++ b/xorg-server/dix/devices.c @@ -1340,13 +1340,10 @@ InitValuatorClassDeviceStruct(DeviceIntPtr dev, int numAxes, Atom *labels, /* global list of acceleration schemes */ ValuatorAccelerationRec pointerAccelerationScheme[] = { - {PtrAccelNoOp, NULL, NULL, NULL, NULL} - , + {PtrAccelNoOp, NULL, NULL, NULL, NULL}, {PtrAccelPredictable, acceleratePointerPredictable, NULL, - InitPredictableAccelerationScheme, AccelerationDefaultCleanup} - , - {PtrAccelLightweight, acceleratePointerLightweight, NULL, NULL, NULL} - , + InitPredictableAccelerationScheme, AccelerationDefaultCleanup}, + {PtrAccelLightweight, acceleratePointerLightweight, NULL, NULL, NULL}, {-1, NULL, NULL, NULL, NULL} /* terminator */ }; @@ -1383,8 +1380,7 @@ InitPointerAccelerationScheme(DeviceIntPtr dev, int scheme) if (pointerAccelerationScheme[i].AccelInitProc) { if (!pointerAccelerationScheme[i].AccelInitProc(dev, - &pointerAccelerationScheme - [i])) { + &pointerAccelerationScheme[i])) { return FALSE; } } |