andreacavalli
/
xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xkb: silence a compiler warning 

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>
This commit is contained in:
Peter Hutterer 2021-03-18 09:59:17 +10:00 committed by Povilas Kanapickas
parent f6b8f8c071
commit 66ce61983d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xkb/xkb.c
View File

@ -2716,7 +2716,7 @@ _XkbSetMap(ClientPtr client, DeviceIntPtr dev, xkbSetMapReq * req, char *values)
int int
ProcXkbSetMap(ClientPtr client) ProcXkbSetMap(ClientPtr client)
{ {
DeviceIntPtr dev; DeviceIntPtr dev, master;
char *tmp; char *tmp;
int rc; int rc;
@ -2744,7 +2744,7 @@ ProcXkbSetMap(ClientPtr client)
if (rc != Success) if (rc != Success)
return rc; return rc;
DeviceIntPtr master = GetMaster(dev, MASTER_KEYBOARD); master = GetMaster(dev, MASTER_KEYBOARD);
if (stuff->deviceSpec == XkbUseCoreKbd) { if (stuff->deviceSpec == XkbUseCoreKbd) {
DeviceIntPtr other; DeviceIntPtr other;