summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 22:20:14 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 22:20:14 +0930
commita34f0fade531ab4c2efeb3ae0adbe45f0e919469 (patch)
tree9abe3800ecfd21a56f2ae8715751fa248c0788da
parent65cbd867bdcd241c8576a95c306293fd9a1f74cb (diff)
Check for XINPUT ABI 3.
-rw-r--r--src/spaceorb.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/spaceorb.c b/src/spaceorb.c
index 7a8f6e6..5452ef7 100644
--- a/src/spaceorb.c
+++ b/src/spaceorb.c
@@ -107,7 +107,9 @@ static const char *reqSymbols[] = {
"xf86CollectInputOptions",
"xf86ErrorFVerb",
"xf86FindOptionValue",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
"xf86GetMotionEvents",
+#endif
"xf86GetVerbosity",
"xf86MotionHistoryAllocate",
"xf86NameCmp",
@@ -337,7 +339,10 @@ DeviceInit (DeviceIntPtr dev)
return !Success;
}
- if (InitValuatorClassDeviceStruct (dev, 6, xf86GetMotionEvents,
+ if (InitValuatorClassDeviceStruct (dev, 6,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
pInfo->history_size, Absolute) == FALSE)
{
ErrorF ("Unable to allocate SPACEORB ValuatorClassDeviceStruct\n");