diff options
| author | Matthieu Herrb <matthieu@herrb.eu> | 2016-01-02 10:49:56 +0100 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2016-01-02 10:49:56 +0100 |
| commit | 5a33ddf5c8de2fc2a4f6f0d57eaa11f8a0e70e4a (patch) | |
| tree | d33d383468327c0e7d2b408b7d050f58f32e8556 /Xtrans.c | |
| parent | f9225fa3747dfc8f15c3a5282141bdb63f0834ee (diff) | |
| parent | cc29fbc1fe86ae4dfe2f4eaae7352ea86aa4acac (diff) | |
Merge remote-tracking branch 'origin/master' into obsd
Diffstat (limited to 'Xtrans.c')
| -rw-r--r-- | Xtrans.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -100,15 +100,15 @@ Xtransport_table Xtransports[] = { #endif /* UNIXCONN */ #if defined(LOCALCONN) { &TRANS(LocalFuncs), TRANS_LOCAL_LOCAL_INDEX }, -#ifndef sun +#ifndef __sun { &TRANS(PTSFuncs), TRANS_LOCAL_PTS_INDEX }, -#endif /* sun */ +#endif /* __sun */ #if defined(SVR4) || defined(__SVR4) { &TRANS(NAMEDFuncs), TRANS_LOCAL_NAMED_INDEX }, #endif -#ifdef sun +#ifdef __sun { &TRANS(PIPEFuncs), TRANS_LOCAL_PIPE_INDEX }, -#endif /* sun */ +#endif /* __sun */ #if defined(__SCO__) || defined(__UNIXWARE__) { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, #endif /* __SCO__ || __UNIXWARE__ */ @@ -1418,7 +1418,7 @@ TRANS(MakeAllCLTSServerListeners) (const char *port, int *partial, */ -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) || defined(WIN32) +#ifdef WIN32 /* * emulate readv @@ -1448,9 +1448,6 @@ static int TRANS(ReadV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) return total; } -#endif /* SYSV && __i386__ || WIN32 || __sxg__ */ - -#if defined(SYSV) && defined(__i386__) && !defined(__SCO__) && !defined(sun) || defined(WIN32) /* * emulate writev @@ -1480,7 +1477,7 @@ static int TRANS(WriteV) (XtransConnInfo ciptr, struct iovec *iov, int iovcnt) return total; } -#endif /* SYSV && __i386__ || WIN32 || __sxg__ */ +#endif /* WIN32 */ #if defined(_POSIX_SOURCE) || defined(USG) || defined(SVR4) || defined(__SVR4) || defined(__SCO__) |