diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-17 16:46:41 +0100 |
| commit | 97fb1dadc6c52adeba0ac0684129520288ab794f (patch) | |
| tree | 6a3b54bec00abec5b571087dd001a33d62bf488c /xorg-server/Xext | |
| parent | b99cdb7509cad0b99761d19fe99637177913412b (diff) | |
| parent | d41bc08d1ae8c4784c09d8977816c0fadab1ba52 (diff) | |
| download | vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.gz vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.tar.bz2 vcxsrv-97fb1dadc6c52adeba0ac0684129520288ab794f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/swrast/s_readpix.c
Diffstat (limited to 'xorg-server/Xext')
| -rw-r--r-- | xorg-server/Xext/xselinux_ext.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/xorg-server/Xext/xselinux_ext.c b/xorg-server/Xext/xselinux_ext.c index 56f2d1ff2..a18a36706 100644 --- a/xorg-server/Xext/xselinux_ext.c +++ b/xorg-server/Xext/xselinux_ext.c @@ -337,7 +337,7 @@ static int SELinuxSendItemsToClient(ClientPtr client, SELinuxListItemRec *items, int size, int count) { - int rc, k, n, pos = 0; + int rc, k, pos = 0; SELinuxListItemsReply rep; CARD32 *buf; @@ -526,11 +526,6 @@ ProcSELinuxDispatch(ClientPtr client) static int SProcSELinuxQueryVersion(ClientPtr client) { - REQUEST(SELinuxQueryVersionReq); - - REQUEST_SIZE_MATCH(SELinuxQueryVersionReq); - swaps(&stuff->client_major); - swaps(&stuff->client_minor); return ProcSELinuxQueryVersion(client); } |