diff options
Diffstat (limited to 'X11/xtrans/Xtrans.c')
| -rw-r--r-- | X11/xtrans/Xtrans.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c index d9e32d01f..0d6ebaa78 100644 --- a/X11/xtrans/Xtrans.c +++ b/X11/xtrans/Xtrans.c @@ -48,11 +48,15 @@ from The Open Group. */ #include <ctype.h> +#include <unistd.h> #ifdef HAVE_SYSTEMD_DAEMON #include <string.h> #include <systemd/sd-daemon.h> #endif +#ifdef _MSC_VER +#include <X11\Xwinsock.h> +#endif /* * The transport table contains a definition for every transport (protocol) * family. All operations that can be made on the transport go through this @@ -112,9 +116,10 @@ Xtransport_table Xtransports[] = { { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, #endif /* __SCO__ || __UNIXWARE__ */ #endif /* LOCALCONN */ + { NULL, 0} }; -#define NUMTRANS (sizeof(Xtransports)/sizeof(Xtransport_table)) +#define NUMTRANS (sizeof(Xtransports)/sizeof(Xtransport_table)-1) #ifdef WIN32 @@ -699,7 +704,7 @@ TRANS(SetOption) (XtransConnInfo ciptr, int option, int arg) #if defined(WIN32) { #ifdef WIN32 - u_long arg; + unsigned long arg; #else int arg; #endif @@ -927,7 +932,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) { @@ -939,7 +943,6 @@ TRANS(RecvFd) (XtransConnInfo ciptr) { return ciptr->transptr->RecvFd(ciptr); } -#endif int TRANS(Disconnect) (XtransConnInfo ciptr) |