summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-08-04 15:31:42 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-08-05 08:01:45 +1000
commit15b425b5a6630d2ac95b490f4f4dbb9240ac9c5d (patch)
tree290f8841727640a66493c116679e45e397d7e947
parente10f802c8260e034fd6c835d3f2622d9cd5085f8 (diff)
dmx: move 'state' around to silence compiler warning.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--hw/dmx/input/dmxevents.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/dmx/input/dmxevents.c b/hw/dmx/input/dmxevents.c
index 24275a189..d8ffe6d58 100644
--- a/hw/dmx/input/dmxevents.c
+++ b/hw/dmx/input/dmxevents.c
@@ -99,7 +99,6 @@ static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
KeySym keySym)
{
DMXInputInfo *dmxInput = &dmxInputs[dmxLocal->inputIdx];
- unsigned short state = 0;
#if 1 /* hack to detect ctrl-alt-q, etc */
static int ctrl = 0, alt = 0;
@@ -119,6 +118,8 @@ static int dmxCheckFunctionKeys(DMXLocalInputInfoPtr dmxLocal,
if (!ctrl || !alt)
return 0;
#else
+ unsigned short state = 0;
+
if (dmxLocal->sendsCore)
state = dmxLocalCoreKeyboard->pDevice->key->state;
else if (dmxLocal->pDevice->key)