fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-20 12:50:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dix: Fix builds with meson -Dxace=false -Dwerror=true

Browse source 
CI meson-disable-options builds were failing with:
../dix/events.c: In function ‘CoreEnterLeaveEvent’:
../dix/events.c:4723:19: error: unused variable ‘client’
 [-Werror=unused-variable]
 4723 |         ClientPtr client = grab ? rClient(grab) : wClient(pWin);
      |                   ^~~~~~
../dix/events.c: In function ‘CoreFocusEvent’:
../dix/events.c:4834:19: error: unused variable ‘client’
 [-Werror=unused-variable]
 4834 |         ClientPtr client = wClient(pWin);
      |                   ^~~~~~

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2056>
This commit is contained in:
Alan Coopersmith 2025-08-19 18:52:16 -07:00
parent 8bbf497e22
commit 6611caf828
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dix/events.c
View file

@ -4720,7 +4720,9 @@ CoreEnterLeaveEvent(DeviceIntPtr mouse,
xKeymapEvent ke = { xKeymapEvent ke = {
.type = KeymapNotify .type = KeymapNotify
}; };
#ifdef XACE
ClientPtr client = grab ? rClient(grab) : wClient(pWin); ClientPtr client = grab ? rClient(grab) : wClient(pWin);
#endif
int rc; int rc;
rc = XaceHookDeviceAccess(client, keybd, DixReadAccess); rc = XaceHookDeviceAccess(client, keybd, DixReadAccess);
@ -4831,7 +4833,9 @@ CoreFocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
xKeymapEvent ke = { xKeymapEvent ke = {
.type = KeymapNotify .type = KeymapNotify
}; };
#ifdef XACE
ClientPtr client = wClient(pWin); ClientPtr client = wClient(pWin);
#endif
int rc; int rc;
rc = XaceHookDeviceAccess(client, dev, DixReadAccess); rc = XaceHookDeviceAccess(client, dev, DixReadAccess);