diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:19:12 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:19:12 +0930 |
| commit | 5e1c22ff2c21cd20b204394731e2ad8ce1980091 (patch) | |
| tree | 4afe1fac76408eb6dfedb9497c095576dc5e5b30 | |
| parent | d66c0b070d6a80b7b5d98cf364149fbc2df81fac (diff) | |
Check for XINPUT ABI 3.
| -rw-r--r-- | src/xf86PM.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xf86PM.c b/src/xf86PM.c index 612b68b..7c65ee3 100644 --- a/src/xf86PM.c +++ b/src/xf86PM.c @@ -105,7 +105,9 @@ static const char *reqSymbols[] = { "xf86CollectInputOptions", "xf86ErrorFVerb", "xf86FindOptionValue", +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 "xf86GetMotionEvents", +#endif "xf86GetVerbosity", "xf86MotionHistoryAllocate", "xf86NameCmp", @@ -195,7 +197,10 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) * Device reports motions on 2 axes in absolute coordinates. * Axes min and max values are reported in raw coordinates. */ - if (InitValuatorClassDeviceStruct (dev, 2, xf86GetMotionEvents, + if (InitValuatorClassDeviceStruct (dev, 2, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif pInfo->history_size, Absolute) == FALSE) { ErrorF ("Unable to allocate PenMount ValuatorClassDeviceStruct\n"); |