diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:05:48 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:05:48 +0930 |
| commit | e239d630a5b0097a1c364c68eb63a5e75cda2715 (patch) | |
| tree | 836de44365161cd56334d9938d4bbb386c44f513 | |
| parent | 2f052f7442df5f4d0a6b271f72f61e93731ed8a7 (diff) | |
Check for XINPUT ABI 3.
| -rw-r--r-- | src/xf86Dyna.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xf86Dyna.c b/src/xf86Dyna.c index 0a899f0..a728f0f 100644 --- a/src/xf86Dyna.c +++ b/src/xf86Dyna.c @@ -98,7 +98,9 @@ static const char *reqSymbols[] = { "xf86CollectInputOptions", "xf86ErrorFVerb", "xf86FindOptionValue", +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 "xf86GetMotionEvents", +#endif "xf86GetVerbosity", "xf86MotionHistoryAllocate", "xf86NameCmp", @@ -296,7 +298,10 @@ DeviceControl (DeviceIntPtr dev, int mode) * 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 Dynapro ValuatorClassDeviceStruct\n"); |