diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-08 00:09:40 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-06-08 00:13:35 +0930 |
| commit | d40125ea8c2ce6ec0f98bdc0655f79aa7274152e (patch) | |
| tree | dca7b9d26425c578f03a3e51c30a93149ce0d66f | |
| parent | Check for XINPUT ABI, parameters of InitValuatorClassRec have changed. (diff) | |
| download | xf86-input-evdev-d40125ea8c2ce6ec0f98bdc0655f79aa7274152e.tar.gz xf86-input-evdev-d40125ea8c2ce6ec0f98bdc0655f79aa7274152e.tar.bz2 xf86-input-evdev-d40125ea8c2ce6ec0f98bdc0655f79aa7274152e.zip | |
Revert "Check for XINPUT ABI, parameters of InitValuatorClassRec have changed."
GetMotionEvents() doesn't exist, led to compile errors with servers pre-MPX
merge. Thanks to Sven Wegener for pointing this out.
This reverts commit 42422d8f69e6806e1adfd93017cac064a75041c7.
| -rw-r--r-- | src/evdev.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/evdev.c b/src/evdev.c index 3fe0708..13f03d3 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -726,10 +726,7 @@ EvdevAddAbsClass(DeviceIntPtr device) pEvdev->min_y = absinfo_y.minimum; pEvdev->max_y = absinfo_y.maximum; - if (!InitValuatorClassDeviceStruct(device, 2, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - GetMotionEvents(), -#endif + if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory, GetMotionHistorySize(), Absolute)) return !Success; @@ -759,10 +756,7 @@ EvdevAddRelClass(DeviceIntPtr device) pInfo = device->public.devicePrivate; - if (!InitValuatorClassDeviceStruct(device, 2, -#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 - GetMotionEvents(), -#endif + if (!InitValuatorClassDeviceStruct(device, 2, GetMotionHistory, GetMotionHistorySize(), Relative)) return !Success; |