aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-06-08 00:12:03 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-06-08 00:15:26 +0930
commitda112737eb109dc263169e820b7ef903b7f8624f (patch)
treec46155f1b2ba546579925f2deab13c98d9da3e80
parentRevert "Check for XINPUT ABI, parameters of InitValuatorClassRec have changed." (diff)
downloadxf86-input-evdev-da112737eb109dc263169e820b7ef903b7f8624f.tar.gz
xf86-input-evdev-da112737eb109dc263169e820b7ef903b7f8624f.tar.bz2
xf86-input-evdev-da112737eb109dc263169e820b7ef903b7f8624f.zip
Check for XINPUT ABI < 3 (corrected version)
Thanks to Sven Wegener for pointing out the incorrect previous version.
-rw-r--r--src/evdev.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/evdev.c b/src/evdev.c
index 13f03d3..b146d41 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -726,7 +726,10 @@ EvdevAddAbsClass(DeviceIntPtr device)
pEvdev->min_y = absinfo_y.minimum;
pEvdev->max_y = absinfo_y.maximum;
- if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
+ if (!InitValuatorClassDeviceStruct(device, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ GetMotionHistory,
+#endif
GetMotionHistorySize(), Absolute))
return !Success;
@@ -756,7 +759,10 @@ EvdevAddRelClass(DeviceIntPtr device)
pInfo = device->public.devicePrivate;
- if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory,
+ if (!InitValuatorClassDeviceStruct(device, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ GetMotionHistory,
+#endif
GetMotionHistorySize(), Relative))
return !Success;