diff options
| author | marha <marha@users.sourceforge.net> | 2010-12-26 21:23:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-12-26 21:23:55 +0000 |
| commit | 8f1afd266a69c5454dccf130e8522575c7aecae8 (patch) | |
| tree | d647da44b8f803428e3217d54bd42d89e72fa803 /X11/xtrans/Xtrans.c | |
| parent | cc5b4c212b7c88026e8ebc5f3d82473149a040c5 (diff) | |
| parent | f28d4c94798d88757227b8c517a05a6ca354dc6f (diff) | |
| download | vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.gz vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.tar.bz2 vcxsrv-8f1afd266a69c5454dccf130e8522575c7aecae8.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'X11/xtrans/Xtrans.c')
| -rw-r--r-- | X11/xtrans/Xtrans.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/X11/xtrans/Xtrans.c b/X11/xtrans/Xtrans.c index d3079ff48..e86b6c645 100644 --- a/X11/xtrans/Xtrans.c +++ b/X11/xtrans/Xtrans.c @@ -75,7 +75,7 @@ from The Open Group. #define TRANS_LOCAL_LOCAL_INDEX 9 #define TRANS_LOCAL_PTS_INDEX 10 #define TRANS_LOCAL_NAMED_INDEX 11 -#define TRANS_LOCAL_ISC_INDEX 12 +/* 12 used to be ISC, but that's gone. */ #define TRANS_LOCAL_SCO_INDEX 13 #define TRANS_SOCKET_INET6_INDEX 14 #define TRANS_LOCAL_PIPE_INDEX 15 @@ -111,12 +111,10 @@ Xtransport_table Xtransports[] = { #endif #ifdef sun { &TRANS(PIPEFuncs), TRANS_LOCAL_PIPE_INDEX }, -#else /* !sun */ -#if !defined(__SCO__) && !defined(__UNIXWARE__) - { &TRANS(ISCFuncs), TRANS_LOCAL_ISC_INDEX }, -#endif - { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, #endif /* sun */ +#if defined(__SCO__) || defined(__UNIXWARE__) + { &TRANS(SCOFuncs), TRANS_LOCAL_SCO_INDEX }, +#endif /* __SCO__ || __UNIXWARE__ */ #endif /* LOCALCONN */ { NULL, 0} }; @@ -957,7 +955,7 @@ int TRANS(IsLocal) (XtransConnInfo ciptr) { - return (ciptr->family == AF_UNIX); + return (ciptr->family == AF_UNIX); } |