diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-08 13:12:15 +0100 |
| commit | f707ea3ce065f0ce40f586c40283fab42059b485 (patch) | |
| tree | 055a5ccdecaec105365d1de9a90d7d6b38f257fb /X11/xtrans/Xtrans.c | |
| parent | c8483dc2831dc37d93a36804022f6b064f5962ea (diff) | |
| parent | 09e94a8e392e8fe6fd89ddefbf3897a92e525b5b (diff) | |
| download | vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.gz vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.tar.bz2 vcxsrv-f707ea3ce065f0ce40f586c40283fab42059b485.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Added presentproto-1.0
libxtrans libxcb xcb-proto mesa git update 8 nov 2013
Conflicts:
X11/xtrans/Xtransint.h
X11/xtrans/Xtranssock.c
libxcb/src/.gitignore
mesalib/src/mesa/drivers/dri/common/dri_util.c
Diffstat (limited to 'X11/xtrans/Xtrans.c')
| -rw-r--r-- | X11/xtrans/Xtrans.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c index d14136b70..93358bc75 100644 --- a/X11/xtrans/Xtrans.c +++ b/X11/xtrans/Xtrans.c @@ -871,12 +871,20 @@ TRANS(Write) (XtransConnInfo ciptr, char *buf, int size) } int +TRANS(Readv) (XtransConnInfo ciptr, struct iovec *buf, int size) + +{ + return ciptr->transptr->Readv (ciptr, buf, size); +} + +int TRANS(Writev) (XtransConnInfo ciptr, struct iovec *buf, int size) { return ciptr->transptr->Writev (ciptr, buf, size); } +#if XTRANS_SEND_FDS int TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close) { @@ -888,6 +896,7 @@ TRANS(RecvFd) (XtransConnInfo ciptr) { return ciptr->transptr->RecvFd(ciptr); } +#endif int TRANS(Disconnect) (XtransConnInfo ciptr) |