aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/dix
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-30 10:59:17 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-01-30 10:59:17 +0100
commitc8d69ebaeed8005d38c91613ab699747f45b2228 (patch)
treecd93f7cdaa242660d2c19ea5514cd3f674aaeb75 /nx-X11/programs/Xserver/dix
parent105cd2be6dfce3579cb585a8d78f655f19cef57b (diff)
parent4821edfe0ecc2296745c4c5fcaa4c08245673c6e (diff)
downloadnx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.gz
nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.tar.bz2
nx-libs-c8d69ebaeed8005d38c91613ab699747f45b2228.zip
Merge branch 'uli42-pr/fix_shadowed_vars' into 3.6.x
Attributes GH PR #895: https://github.com/ArcticaProject/nx-libs/pull/895
Diffstat (limited to 'nx-X11/programs/Xserver/dix')
-rw-r--r--nx-X11/programs/Xserver/dix/cursor.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/programs/Xserver/dix/cursor.c b/nx-X11/programs/Xserver/dix/cursor.c
index 658edcb87..8f6f82c6d 100644
--- a/nx-X11/programs/Xserver/dix/cursor.c
+++ b/nx-X11/programs/Xserver/dix/cursor.c
@@ -145,7 +145,7 @@ CheckForEmptyMask(CursorBitsPtr bits)
if (bits->argb)
{
CARD32 *argb = bits->argb;
- int n = bits->width * bits->height;
+ n = bits->width * bits->height;
while (n--)
if (*argb++ & 0xff000000) return;
}