aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi/getfctl.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-11 11:55:48 +0200
committermarha <marha@users.sourceforge.net>2012-07-11 11:55:48 +0200
commit6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (patch)
tree21e1af7ee94600e349ae21353dc11963a06e988d /xorg-server/Xi/getfctl.c
parent75f57cf199b6c042b0f7515e3a1ab80f7ccecfab (diff)
parentd137057fd13e83ec15ab416c7fe774741da06047 (diff)
downloadvcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.gz
vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.tar.bz2
vcxsrv-6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c
Diffstat (limited to 'xorg-server/Xi/getfctl.c')
-rw-r--r--xorg-server/Xi/getfctl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/Xi/getfctl.c b/xorg-server/Xi/getfctl.c
index 2772c0c26..e235e7c1f 100644
--- a/xorg-server/Xi/getfctl.c
+++ b/xorg-server/Xi/getfctl.c
@@ -265,7 +265,7 @@ SRepXGetFeedbackControl(ClientPtr client, int size,
swaps(&rep->sequenceNumber);
swapl(&rep->length);
swaps(&rep->num_feedbacks);
- WriteToClient(client, size, (char *) rep);
+ WriteToClient(client, size, rep);
}
/***********************************************************************
@@ -295,10 +295,11 @@ ProcXGetFeedbackControl(ClientPtr client)
if (rc != Success)
return rc;
+
rep.repType = X_Reply;
rep.RepType = X_GetFeedbackControl;
- rep.length = 0;
rep.sequenceNumber = client->sequence;
+ rep.length = 0;
rep.num_feedbacks = 0;
for (k = dev->kbdfeed; k; k = k->next) {