summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 22:23:03 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 22:23:03 +0930
commit23736802e6831bd42f2597e0dd3af3acf97242f8 (patch)
tree665f50836d7e347b48b3a76eca18058d76860104
parent21a628e137d608b045040b99098d82c31b4cc008 (diff)
Check for XINPUT ABI 3.
-rw-r--r--src/xf86Ur-98.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xf86Ur-98.c b/src/xf86Ur-98.c
index dabf3ca..2b148b0 100644
--- a/src/xf86Ur-98.c
+++ b/src/xf86Ur-98.c
@@ -49,7 +49,9 @@ static const char *reqSymbols[] = {
"xf86CollectInputOptions",
"xf86ErrorFVerb",
"xf86FindOptionValue",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
"xf86GetMotionEvents",
+#endif
"xf86GetVerbosity",
"xf86MotionHistoryAllocate",
"xf86NameCmp",
@@ -316,7 +318,10 @@ xf86UR98Control(DeviceIntPtr dev,
* screen to fit one meter.
*/
- if (InitValuatorClassDeviceStruct(dev, priv->axes, xf86GetMotionEvents,
+ if (InitValuatorClassDeviceStruct(dev, priv->axes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
local->history_size, Absolute) == FALSE) {
ErrorF("Unable to allocate ValuatorClassDeviceStruct\n");
return !Success;