summaryrefslogtreecommitdiff
path: root/hw/dmx
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-08 17:14:53 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-13 10:30:16 +1000
commit545f11139d600febf1c5fd46b11bea4352b82c32 (patch)
treef2d1cc7b5df4ce3546533b237a52709c8bff5cef /hw/dmx
parent7d703af74ced36968f4480507a7eb54d249b5edc (diff)
dmx: compiler warning fix (mixed declarations + code)
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'hw/dmx')
-rw-r--r--hw/dmx/input/dmxeq.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c
index 33e8771c9..3c2b44c1a 100644
--- a/hw/dmx/input/dmxeq.c
+++ b/hw/dmx/input/dmxeq.c
@@ -158,6 +158,7 @@ void dmxeqEnqueue(DeviceIntPtr pDev, xEvent *e)
{
HWEventQueueType oldtail, newtail;
Bool isMotion;
+ deviceKeyButtonPointer *ev;
oldtail = dmxEventQueue.tail;
isMotion = e->u.u.type == MotionNotify;
@@ -182,7 +183,7 @@ void dmxeqEnqueue(DeviceIntPtr pDev, xEvent *e)
dmxEventQueue.events[oldtail].pDev = pDev;
/* If this is an XInput event, store the
* valuator event, too */
- deviceKeyButtonPointer *ev = (deviceKeyButtonPointer *)e;
+ ev = (deviceKeyButtonPointer *)e;
if (e->u.u.type >= LASTEvent && (ev->deviceid & MORE_EVENTS))
dmxEventQueue.events[oldtail].valuator = *(deviceValuator *)(ev+1);