[PATCH] evdev: Partly revert commit 42422d8f "Check for XINPUT ABI, parameters of InitValuatorClassRec have changed."
Sven Wegener
swegener at gentoo.org
Sat Jun 7 03:23:49 PDT 2008
The commit 42422d8f has added compability for new ABI_XINPUT_VERSION, but
broke the code for current ABI versions. InitValuatorClassDeviceStruct
wants a function pointer, GetMotionEvents() doesn't even exist and leads
to "undefined symbol" failures.
Signed-off-by: Sven Wegener <swegener at gentoo.org>
---
evdev.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
The first patch I sent has whitespace errors.
diff --git a/src/evdev.c b/src/evdev.c
index 3fe0708..b146d41 100644
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -728,7 +728,7 @@ EvdevAddAbsClass(DeviceIntPtr device)
if (!InitValuatorClassDeviceStruct(device, 2,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- GetMotionEvents(),
+ GetMotionHistory,
#endif
GetMotionHistorySize(), Absolute))
return !Success;
@@ -761,7 +761,7 @@ EvdevAddRelClass(DeviceIntPtr device)
if (!InitValuatorClassDeviceStruct(device, 2,
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
- GetMotionEvents(),
+ GetMotionHistory,
#endif
GetMotionHistorySize(), Relative))
return !Success;
More information about the xorg
mailing list