summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 22:18:17 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-05-26 22:18:17 +0930
commit29808414b49ce929ccf5a6729929c2a3ead32b04 (patch)
tree09405905cfbc5229409960c52f98a2044ec481b2
parent17f1dc5d593a3056bee74d53a31e38065b7236d0 (diff)
Check for XINPUT ABI 3.
-rw-r--r--src/xf86Palmax.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xf86Palmax.c b/src/xf86Palmax.c
index e42f169..bb77f07 100644
--- a/src/xf86Palmax.c
+++ b/src/xf86Palmax.c
@@ -68,7 +68,9 @@ static const char *reqSymbols[] = {
"xf86CollectInputOptions",
"xf86ErrorFVerb",
"xf86FindOptionValue",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
"xf86GetMotionEvents",
+#endif
"xf86GetVerbosity",
"xf86MotionHistoryAllocate",
"xf86NameCmp",
@@ -467,7 +469,10 @@ xf86PmxControl(DeviceIntPtr dev,
* screen to fit one meter.
*/
- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents,
+ if (InitValuatorClassDeviceStruct(dev, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
local->history_size, Absolute) == FALSE) {
ErrorF("Unable to allocate ValuatorClassDeviceStruct\n");
return !Success;