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

1 files changed, 9 insertions, 4 deletions

diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c
index 57a001a61..d14136b70 100644
--- a/X11/xtrans/Xtrans.c
+++ b/X11/xtrans/Xtrans.c
@@ -871,17 +871,22 @@ TRANS(Write) (XtransConnInfo ciptr, char *buf, int size)
 }
 
 int
-TRANS(Readv) (XtransConnInfo ciptr, struct iovec *buf, int size)
+TRANS(Writev) (XtransConnInfo ciptr, struct iovec *buf, int size)
 
 {
-    return ciptr->transptr->Readv (ciptr, buf, size);
+    return ciptr->transptr->Writev (ciptr, buf, size);
 }
 
 int
-TRANS(Writev) (XtransConnInfo ciptr, struct iovec *buf, int size)
+TRANS(SendFd) (XtransConnInfo ciptr, int fd, int do_close)
+{
+    return ciptr->transptr->SendFd(ciptr, fd, do_close);
+}
 
+int
+TRANS(RecvFd) (XtransConnInfo ciptr)
 {
-    return ciptr->transptr->Writev (ciptr, buf, size);
+    return ciptr->transptr->RecvFd(ciptr);
 }
 
 int