aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:19:08 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-06-08 08:19:08 +0200
commit1bd98ef7730f8f8807d07b3af0357e31a530e90a (patch)
treee641898ade1f33c16f9e960c8a9c95a5387ea278
parent00711f914d4b0ca76ca66c0225f257d6192807e2 (diff)
parent1b4ebce2ce8ef29c01bd124ed56c9d6a14c9a82d (diff)
downloadnx-libs-1bd98ef7730f8f8807d07b3af0357e31a530e90a.tar.gz
nx-libs-1bd98ef7730f8f8807d07b3af0357e31a530e90a.tar.bz2
nx-libs-1bd98ef7730f8f8807d07b3af0357e31a530e90a.zip
Merge branch 'uli42-pr/fix_async_replies' into 3.6.x
Attributes GH PR #1010: https://github.com/ArcticaProject/nx-libs/pull/1010
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
index 4a8dacaf4..7a6cb9e30 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/compext/Compext.c
@@ -3435,7 +3435,7 @@ static Bool _NXCollectImageHandler(Display *dpy, xReply *rep, char *buf,
state = (_NXCollectImageState *) data;
if ((rep -> generic.sequenceNumber % 65536) !=
- ((int)(state -> sequence) % 65536))
+ ((CARD16)(state -> sequence) % 65536))
{
#ifdef TEST
fprintf(stderr, "******_NXCollectImageHandler: Unmatched sequence [%d] for opcode [%d] "
@@ -3819,7 +3819,7 @@ static Bool _NXCollectPropertyHandler(Display *dpy, xReply *rep, char *buf,
state = (_NXCollectPropertyState *) data;
if ((rep -> generic.sequenceNumber % 65536) !=
- ((int)(state -> sequence) % 65536))
+ ((CARD16)(state -> sequence) % 65536))
{
#ifdef TEST
fprintf(stderr, "******_NXCollectPropertyHandler: Unmatched sequence [%d] for opcode [%d] "
@@ -4173,7 +4173,7 @@ static Bool _NXCollectGrabPointerHandler(Display *dpy, xReply *rep, char *buf,
state = (_NXCollectGrabPointerState *) data;
if ((rep -> generic.sequenceNumber % 65536) !=
- ((int)(state -> sequence) % 65536))
+ ((CARD16)(state -> sequence) % 65536))
{
#ifdef TEST
fprintf(stderr, "******_NXCollectGrabPointerHandler: Unmatched sequence [%d] for opcode [%d] "
@@ -4447,7 +4447,7 @@ static Bool _NXCollectInputFocusHandler(Display *dpy, xReply *rep, char *buf,
state = (_NXCollectInputFocusState *) data;
if ((rep -> generic.sequenceNumber % 65536) !=
- ((int)(state -> sequence) % 65536))
+ ((CARD16)(state -> sequence) % 65536))
{
#ifdef TEST
fprintf(stderr, "******_NXCollectInputFocusHandler: Unmatched sequence [%d] for opcode [%d] "