File xf86-input-microtouch-1.2.0-commit-81435d3.diff of Package xorg-x11-driver-input

Overview Repositories Revisions Requests Users Attributes Meta

File xf86-input-microtouch-1.2.0-commit-81435d3.diff of Package xorg-x11-driver-input (Revision 9457c60b49cf8428713cf14dfef60fd0)

Currently displaying revision 9457c60b49cf8428713cf14dfef60fd0 , Show latest

diff --git a/src/microtouch.c b/src/microtouch.c
index b18a22f..c537cc0 100644
--- a/src/microtouch.c
+++ b/src/microtouch.c
@@ -138,7 +138,9 @@ static const char *reqSymbols[] = {
 	"xf86ErrorFVerb",
 	"xf86FindOptionValue",
 	"xf86FlushInput",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
 	"xf86GetMotionEvents",
+#endif
 	"xf86GetVerbosity",
 	"xf86LoaderReqSymLists",
 	"xf86MotionHistoryAllocate",
@@ -160,12 +162,6 @@ static const char *reqSymbols[] = {
 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
 	"xf86XInputSetSendCoreEvents",
 #endif
-	"xf86memset",
-	"xf86sscanf",
-	"xf86strcmp",
-	"xf86strlen",
-	"xf86strncmp",
-	"xf86strncpy",
         NULL
 };
 
@@ -425,7 +421,10 @@ DeviceInit (DeviceIntPtr dev)
 	 * 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
 									local->history_size, Absolute) == FALSE)
 	{
 		ErrorF ("Unable to allocate MicroTouch touchscreen ValuatorClassDeviceStruct\n");

Places

File xf86-input-microtouch-1.2.0-commit-81435d3.diff of Package xorg-x11-driver-input (Revision 9457c60b49cf8428713cf14dfef60fd0)

Places