aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-01-09 21:13:02 +0100
committerUlrich Sibiller <uli42@gmx.de>2020-01-09 21:13:02 +0100
commit7031219d94573bcf1ae4213cb62182a1002e0a7b (patch)
tree27a74520aa039a1fa7fca30fb5c1f40a3c4f332a /nx-X11/programs/Xserver/hw
parentc137c2a4d68cb17802275739a40cf0ad7eda9bc8 (diff)
downloadnx-libs-7031219d94573bcf1ae4213cb62182a1002e0a7b.tar.gz
nx-libs-7031219d94573bcf1ae4213cb62182a1002e0a7b.tar.bz2
nx-libs-7031219d94573bcf1ae4213cb62182a1002e0a7b.zip
Events.c: fix two shadowed variables
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; ^~~~~~~
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Events.c4
1 files 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__);