diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-13 08:07:38 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-13 08:07:38 +0100 |
| commit | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (patch) | |
| tree | 064121d82e7edce83e6d4809d6e4a92b1a3e84d6 /xorg-server/os/io.c | |
| parent | 4bdf8409331f44417c3622bc5ec0e42c0e68afb6 (diff) | |
| download | vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.tar.gz vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.tar.bz2 vcxsrv-8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d.zip | |
mesa xserver pixman git update 9 nov 2013
xserver commit 4a251f5883b042cd902c192060a0be2b11148f2b
pixman commit 8487dfbcd056eff066939dc253fcf361b391592a
mesa commit e0489531455623aa21aa565b2c890362d8437f23
Diffstat (limited to 'xorg-server/os/io.c')
| -rw-r--r-- | xorg-server/os/io.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/os/io.c b/xorg-server/os/io.c index a20faa56f..922a8eb02 100644 --- a/xorg-server/os/io.c +++ b/xorg-server/os/io.c @@ -259,12 +259,14 @@ ReadRequestFromClient(ClientPtr client) oc->input = oci; } +#if XTRANS_SEND_FDS /* Discard any unused file descriptors */ while (client->req_fds > 0) { int req_fd = ReadFdFromClient(client); if (req_fd >= 0) close(req_fd); } +#endif /* advance to start of next request */ oci->bufptr += oci->lenLastReq; @@ -491,6 +493,7 @@ ReadRequestFromClient(ClientPtr client) return needed; } +#if XTRANS_SEND_FDS int ReadFdFromClient(ClientPtr client) { @@ -513,6 +516,7 @@ WriteFdToClient(ClientPtr client, int fd, Bool do_close) return _XSERVTransSendFd(oc->trans_conn, fd, do_close); } +#endif /***************************************************************** * InsertFakeRequest |