From 42422d8f69e6806e1adfd93017cac064a75041c7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 26 May 2008 19:17:19 +0930 Subject: Check for XINPUT ABI, parameters of InitValuatorClassRec have changed. --- src/evdev.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 13f03d3..3fe0708 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 + GetMotionEvents(), +#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 + GetMotionEvents(), +#endif GetMotionHistorySize(), Relative)) return !Success; -- cgit v1.2.3