Merge remote-tracking branch 'origin/released'

Conflicts:
	xorg-server/Xext/dpms.c
	xorg-server/Xext/saver.c
	xorg-server/Xext/security.c
	xorg-server/Xext/shape.c
	xorg-server/Xext/sync.c
	xorg-server/Xi/opendev.c
	xorg-server/fb/wfbrename.h
	xorg-server/glx/glxserver.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/mi/miarc.c
	xorg-server/mi/miwideline.c
	xorg-server/os/io.c
	xorg-server/render/mipict.c

1 files changed, 5 insertions, 7 deletions

diff --git a/xorg-server/Xi/xigetclientpointer.c b/xorg-server/Xi/xigetclientpointer.c
index 401e89fb4..1124ae08c 100644
--- a/xorg-server/Xi/xigetclientpointer.c
+++ b/xorg-server/Xi/xigetclientpointer.c
@@ -49,11 +49,10 @@
 int
 SProcXIGetClientPointer(ClientPtr client)
 {
-    char n;
     REQUEST(xXIGetClientPointerReq);
 
-    swaps(&stuff->length, n);
-    swapl(&stuff->win, n);
+    swaps(&stuff->length);
+    swapl(&stuff->win);
     return ProcXIGetClientPointer(client);
 }
 
@@ -97,10 +96,9 @@ void
 SRepXIGetClientPointer(ClientPtr client, int size,
         xXIGetClientPointerReply* rep)
 {
-    char n;
-    swaps(&rep->sequenceNumber, n);
-    swapl(&rep->length, n);
-    swaps(&rep->deviceid, n);
+    swaps(&rep->sequenceNumber);
+    swapl(&rep->length);
+    swaps(&rep->deviceid);
     WriteToClient(client, size, (char *)rep);
 }