diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:05:06 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:05:06 +0930 |
| commit | 3c75c2bed83d9a762dc268dfa797826a3b198932 (patch) | |
| tree | 6fa70ba8d530c52797c613f1446fe7e0ba252c56 | |
| parent | a588412e30c6e1d23817c8a559e4e3b583f980e2 (diff) | |
Check for XINPUT ABI 3.
| -rw-r--r-- | src/xf86DMC.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xf86DMC.c b/src/xf86DMC.c index e6797d8..daa0f20 100644 --- a/src/xf86DMC.c +++ b/src/xf86DMC.c @@ -106,7 +106,9 @@ static const char *reqSymbols[] = { "xf86CollectInputOptions", "xf86ErrorFVerb", "xf86FindOptionValue", +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 "xf86GetMotionEvents", +#endif "xf86GetVerbosity", "xf86MotionHistoryAllocate", "xf86NameCmp", @@ -301,7 +303,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 DMC ValuatorClassDeviceStruct\n"); |