summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-07 17:05:56 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-07 17:06:45 +1000
commit6b476f2e22337e6d0b4f0e6194ed25e0ed0f9330 (patch)
treea5678cd4764a96abce44b1dabf671a8363dd8ad4
parent6bc27d6b56336c6dbaad026fb0478f7e620c6258 (diff)
Don't pass an empty RMLVO to InitKeyboardDeviceStruct.
Passing in NULL is ok, an empty one isn't. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--src/void.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/void.c b/src/void.c
index c4016a0..c741d87 100644
--- a/src/void.c
+++ b/src/void.c
@@ -177,9 +177,6 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
InputInfoPtr pInfo;
unsigned char map[MAXBUTTONS + 1];
int i;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
- XkbRMLVOSet rmlvo;
-#endif
Bool result;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[MAXBUTTONS] = {0};
@@ -215,8 +212,7 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
- memset(&rmlvo, 0, sizeof(XkbRMLVOSet));
- result = InitKeyboardDeviceStruct(device, &rmlvo,
+ result = InitKeyboardDeviceStruct(device, NULL,
BellProc, KeyControlProc);
#else
result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms,