summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2011-01-20 18:55:20 -0500
committerAdam Jackson <ajax@redhat.com>2011-01-20 21:03:35 -0500
commitffd323b7c0212ed9b348e51cd9b36363d7c4d1f2 (patch)
tree5dd087232d783cc046efdc26132803ebed2e7381
parentc1fe0b155d0567440228aa5d9e36036f37670e3b (diff)
dmx: warning fix
dmxinputinit.c: At top level: dmxinputinit.c:135:29: warning: ‘DMXCommonOth’ defined but not used DMXCommonOth is actually mentioned in a #if 0 block, so delete it and the block that references it. If anyone needs it, git remembers. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Adam Jackson <ajax@redhat.com>
-rw-r--r--hw/dmx/input/dmxinputinit.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c
index 7cac86f79..6fc11cd0d 100644
--- a/hw/dmx/input/dmxinputinit.c
+++ b/hw/dmx/input/dmxinputinit.c
@@ -132,14 +132,6 @@ static DMXLocalInputInfoRec DMXConsoleKbd = {
NULL, dmxCommonKbdCtrl, dmxCommonKbdBell
};
-static DMXLocalInputInfoRec DMXCommonOth = {
- "common-oth", DMX_LOCAL_OTHER, DMX_LOCAL_TYPE_COMMON, 1,
- dmxCommonCopyPrivate, NULL,
- NULL, NULL, NULL, dmxCommonOthGetInfo,
- dmxCommonOthOn, dmxCommonOthOff
-};
-
-
static DMXLocalInputInfoRec DMXLocalDevices[] = {
/* Dummy drivers that can compile on any OS */
#ifdef __linux__
@@ -897,29 +889,6 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI)
}
}
break;
-#if 0
- case IsXExtensionDevice:
- case IsXExtensionKeyboard:
- case IsXExtensionPointer:
- if (doXI) {
- if (!dmxInput->numDevs) {
- dmxLog(dmxWarning,
- "Cannot use remote (%s) XInput devices if"
- " not also using core devices\n",
- dmxInput->name);
- } else {
- dmxLocal = dmxInputCopyLocal(dmxInput,
- &DMXCommonOth);
- dmxLocal->isCore = FALSE;
- dmxLocal->sendsCore = FALSE;
- dmxLocal->deviceId = devices[i].id;
- dmxLocal->deviceName = (devices[i].name
- ? strdup(devices[i].name)
- : NULL);
- }
- }
- break;
-#endif
}
}
XFreeDeviceList(devices);