summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-03-18 09:59:17 +1000
committerPovilas Kanapickas <povilas@radix.lt>2021-04-09 17:37:29 +0000
commit66ce61983db0a067e48143750c4d5557d5638b1c (patch)
treee5704058e70d193e8d32158959885f4f10ea9a54
parentf6b8f8c071a575e54645aeb0bd3cb37377b0e4d3 (diff)
xkb: silence a compiler warningHEADmaster
xkb.c: In function ‘ProcXkbSetMap’: xkb.c:2747:5: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement] 2747 | DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD); Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--xkb/xkb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xkb/xkb.c b/xkb/xkb.c
index d056c698c..183d6ffa1 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -2716,7 +2716,7 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, char *values)
int
ProcXkbSetMap(ClientPtr client)
{
- DeviceIntPtr dev;
+ DeviceIntPtr dev, master;
char *tmp;
int rc;
@@ -2744,7 +2744,7 @@ ProcXkbSetMap(ClientPtr client)
if (rc != Success)
return rc;
- DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD);
+ master = GetMaster(dev, MASTER_KEYBOARD);
if (stuff->deviceSpec == XkbUseCoreKbd) {
DeviceIntPtr other;