diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:02:54 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-26 22:02:54 +0930 |
| commit | c21a961bc71f6c92ce48208e4642a20b09b23149 (patch) | |
| tree | 24f68b4740a93f12e6850404c07091a21954d88e | |
| parent | 6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b (diff) | |
Check for XINPUT ABI 3.
| -rw-r--r-- | src/xf86Calcomp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c index f834eea..46de9be 100644 --- a/src/xf86Calcomp.c +++ b/src/xf86Calcomp.c @@ -132,7 +132,9 @@ static const char *reqSymbols[] = { "xf86CollectInputOptions", "xf86ErrorFVerb", "xf86FindOptionValue", +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 "xf86GetMotionEvents", +#endif "xf86GetVerbosity", "xf86MotionHistoryAllocate", "xf86NameCmp", @@ -308,7 +310,10 @@ DeviceInit (DeviceIntPtr dev) * this example device reports motions on 2 axes in absolute coordinates. * Device may reports touch pressure on the 3rd axis. */ - if (InitValuatorClassDeviceStruct (dev, 3, xf86GetMotionEvents, + if (InitValuatorClassDeviceStruct (dev, 3, +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, +#endif local->history_size, Absolute) == FALSE) { ErrorF ("Unable to allocate CALCOMP ValuatorClassDeviceStruct\n"); |