[PATCH] xf86-input-void: Fix build against XINPUT ABI 5

[Peter Hutterer]

---
untested.

 src/void.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/void.c b/src/void.c
index a5a47be..00aeb52 100644
--- a/src/void.c
+++ b/src/void.c
@@ -202,10 +202,22 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
          return !Success;
        }
 */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
+        {
+            XkbRMLVOSet rmlvo;
+            XkbGetRulesDflts(&rmlvo);
+            if (!InitKeyboardDeviceStruct(device, &rmlvo, BellProc, 
KeyControlProc))
+            {
+                ErrorF("unable to init keyboard device\n");
+                return !Success;
+            }
+        }
+#else
        if (InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms, NULL, 
BellProc, KeyControlProc) == FALSE) {
          ErrorF("unable to init keyboard device\n");
          return !Success;
        }
+#endif
 
        if (InitValuatorClassDeviceStruct(device, 
                                          2,
-- 
1.6.0.6

_______________________________________________
xorg mailing list
xorg@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/xorg