From 3ef320ddf5d23b4e69cc7d44a17f902e245f6426 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 8 Nov 2013 16:53:17 +0100
Subject: Solved compilation and run-time problems after latest merge

---
 X11/xtrans/Xtrans.c     |  2 --
 X11/xtrans/Xtransint.h  |  2 --
 X11/xtrans/Xtranssock.c | 34 ++++++++++++++--------------------
 3 files changed, 14 insertions(+), 24 deletions(-)

(limited to 'X11')

diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c
index 93358bc75..13adf59ef 100644
--- a/X11/xtrans/Xtrans.c
+++ b/X11/xtrans/Xtrans.c
@@ -884,7 +884,6 @@ 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)
 {
@@ -896,7 +895,6 @@ TRANS(RecvFd) (XtransConnInfo ciptr)
 {
     return ciptr->transptr->RecvFd(ciptr);
 }
-#endif
 
 int
 TRANS(Disconnect) (XtransConnInfo ciptr)
diff --git a/X11/xtrans/Xtransint.h b/X11/xtrans/Xtransint.h
index 96d9aa3ce..b2b6821d3 100644
--- a/X11/xtrans/Xtransint.h
+++ b/X11/xtrans/Xtransint.h
@@ -291,7 +291,6 @@ typedef struct _Xtransport {
 	int			/* size */
     );
 
-#if XTRANS_SEND_FDS
     int (*SendFd)(
 	XtransConnInfo,		/* connection */
         int,                    /* fd */
@@ -301,7 +300,6 @@ typedef struct _Xtransport {
     int (*RecvFd)(
 	XtransConnInfo		/* connection */
     );
-#endif
 
     int	(*Disconnect)(
 	XtransConnInfo		/* connection */
diff --git a/X11/xtrans/Xtranssock.c b/X11/xtrans/Xtranssock.c
index b07b10b73..bbc08f4e0 100755
--- a/X11/xtrans/Xtranssock.c
+++ b/X11/xtrans/Xtranssock.c
@@ -2200,20 +2200,6 @@ TRANS(SocketSendFd) (XtransConnInfo ciptr, int fd, int do_close)
     return 0;
 }
 
-static int
-TRANS(SocketRecvFdInvalid)(XtransConnInfo ciptr)
-{
-    errno = EINVAL;
-    return -1;
-}
-
-static int
-TRANS(SocketSendFdInvalid)(XtransConnInfo ciptr, int fd, int do_close)
-{
-    errno = EINVAL;
-    return -1;
-}
-
 #define MAX_FDS		128
 
 struct fd_pass {
@@ -2239,6 +2225,20 @@ static inline void init_msg_send(struct msghdr *msg, struct iovec *iov, int niov
 
 #endif /* XTRANS_SEND_FDS */
 
+static int
+TRANS(SocketRecvFdInvalid)(XtransConnInfo ciptr)
+{
+    errno = EINVAL;
+    return -1;
+}
+
+static int
+TRANS(SocketSendFdInvalid)(XtransConnInfo ciptr, int fd, int do_close)
+{
+    errno = EINVAL;
+    return -1;
+}
+
 static int
 TRANS(SocketRead) (XtransConnInfo ciptr, char *buf, int size)
 
@@ -2549,10 +2549,8 @@ Xtransport	TRANS(SocketTCPFuncs) = {
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
 	TRANS(SocketSendFdInvalid),
 	TRANS(SocketRecvFdInvalid),
-#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketINETClose),
 	TRANS(SocketINETClose),
@@ -2593,10 +2591,8 @@ Xtransport	TRANS(SocketINETFuncs) = {
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
 	TRANS(SocketSendFdInvalid),
 	TRANS(SocketRecvFdInvalid),
-#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketINETClose),
 	TRANS(SocketINETClose),
@@ -2638,10 +2634,8 @@ Xtransport     TRANS(SocketINET6Funcs) = {
 	TRANS(SocketWrite),
 	TRANS(SocketReadv),
 	TRANS(SocketWritev),
-#if XTRANS_SEND_FDS
 	TRANS(SocketSendFdInvalid),
 	TRANS(SocketRecvFdInvalid),
-#endif
 	TRANS(SocketDisconnect),
 	TRANS(SocketINETClose),
 	TRANS(SocketINETClose),
-- 
cgit v1.2.3