File xf86-input-dynapro.diff of Package xorg-x11-driver-input

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-input-dynapro.diff of Package xorg-x11-driver-input

commit e239d630a5b0097a1c364c68eb63a5e75cda2715
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date:   Mon May 26 22:05:48 2008 +0930

Check for XINPUT ABI 3.

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");

Places

File xf86-input-dynapro.diff of Package xorg-x11-driver-input

Places