From 7031219d94573bcf1ae4213cb62182a1002e0a7b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 9 Jan 2020 21:13:02 +0100 Subject: Events.c: fix two shadowed variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Events.c: In function ‘nxagentDispatchEvents’: Events.c:1241:21: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local] ScreenPtr pScreen = nxagentScreen(X.xbutton.window); ^~~~~~~ Events.c:827:13: note: shadowed declaration is here ScreenPtr pScreen = NULL; ^~~~~~~ Events.c:1383:19: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local] ScreenPtr pScreen = nxagentScreen(X.xmotion.window); ^~~~~~~ Events.c:827:13: note: shadowed declaration is here ScreenPtr pScreen = NULL; ^~~~~~~ Events.c: In function ‘nxagentDispatchEvents’: Events.c:1383:19: warning: declaration of ‘pScreen’ shadows a previous local [-Wshadow=compatible-local] ScreenPtr pScreen = nxagentScreen(X.xmotion.window); ^~~~~~~ Events.c:827:13: note: shadowed declaration is here ScreenPtr pScreen = NULL; ^~~~~~~ --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 597359cf1..a06d52a2a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -1238,7 +1238,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already int resource = nxagentWaitForResource(NXGetCollectGrabPointerResource, nxagentCollectGrabPointerPredicate); - ScreenPtr pScreen = nxagentScreen(X.xbutton.window); + pScreen = nxagentScreen(X.xbutton.window); viewportCursor = XCreateFontCursor(nxagentDisplay, XC_fleur); NXCollectGrabPointer(nxagentDisplay, resource, @@ -1380,7 +1380,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was not already } case MotionNotify: { - ScreenPtr pScreen = nxagentScreen(X.xmotion.window); + pScreen = nxagentScreen(X.xmotion.window); #ifdef TEST fprintf(stderr, "%s: Going to handle new MotionNotify event.\n", __func__); -- cgit v1.2.3