From 23736802e6831bd42f2597e0dd3af3acf97242f8 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon, 26 May 2008 22:23:03 +0930
Subject: Check for XINPUT ABI 3.

---
 src/xf86Ur-98.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/xf86Ur-98.c b/src/xf86Ur-98.c
index dabf3ca..2b148b0 100644
--- a/src/xf86Ur-98.c
+++ b/src/xf86Ur-98.c
@@ -49,7 +49,9 @@ static const char *reqSymbols[] = {
 	"xf86CollectInputOptions",
 	"xf86ErrorFVerb",
 	"xf86FindOptionValue",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
 	"xf86GetMotionEvents",
+#endif
 	"xf86GetVerbosity",
 	"xf86MotionHistoryAllocate",
 	"xf86NameCmp",
@@ -316,7 +318,10 @@ xf86UR98Control(DeviceIntPtr	dev,
 		 * screen to fit one meter.
 		 */
 	
-		if (InitValuatorClassDeviceStruct(dev, priv->axes, xf86GetMotionEvents,
+		if (InitValuatorClassDeviceStruct(dev, priv->axes,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+				xf86GetMotionEvents,
+#endif
 				local->history_size, Absolute) == FALSE) {
 			ErrorF("Unable to allocate ValuatorClassDeviceStruct\n");
 			return !Success;
-- 
cgit v1.2.3