diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-07 08:23:50 +0100 |
| commit | 51c3a4e7b08aa904ff2af52a9f6f7adc748b361f (patch) | |
| tree | 38fa447dc8970b83becb4d35487d2bb2e565301b /X11/xtrans/Xtrans.h | |
| parent | d79b6645eb21ca82d506ef038b8ea71a1e431f3f (diff) | |
| parent | 31fd4c5654595a4763e492e4ec26f66ca3a8a405 (diff) | |
| download | vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.gz vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.tar.bz2 vcxsrv-51c3a4e7b08aa904ff2af52a9f6f7adc748b361f.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans fontconfig mesa xserver pixman xkbcomp git update 4 nov 2013
Conflicts:
xorg-server/Xext/shm.c
xorg-server/os/xstrans.c
Diffstat (limited to 'X11/xtrans/Xtrans.h')
| -rw-r--r-- | X11/xtrans/Xtrans.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/X11/xtrans/Xtrans.h b/X11/xtrans/Xtrans.h index 2945b2aba..53b8b627d 100644 --- a/X11/xtrans/Xtrans.h +++ b/X11/xtrans/Xtrans.h @@ -344,18 +344,16 @@ int TRANS(Write)( int /* size */ ); -int TRANS(Readv)( - XtransConnInfo, /* ciptr */ - struct iovec *, /* buf */ - int /* size */ -); - int TRANS(Writev)( XtransConnInfo, /* ciptr */ struct iovec *, /* buf */ int /* size */ ); +int TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close); + +int TRANS(RecvFd) (XtransConnInfo ciptr); + int TRANS(Disconnect)( XtransConnInfo /* ciptr */ ); |