diff options
| author | Jesse Adkins <jesserayadkins@gmail.com> | 2010-11-06 12:53:24 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-11-07 09:29:16 -0800 |
| commit | 05cd71c899e83022147f27085ee652d26f5462cb (patch) | |
| tree | 6c16dead69baebd1a220abea89f5f07ceb2ed90c /Xtrans.c | |
| parent | 0e5a66c82535dd8e9beee9fc4c42c52f90d05f50 (diff) | |
| download | xorg-lib-libxtrans-05cd71c899e83022147f27085ee652d26f5462cb.tar.gz | |
Remove ISCFuncs, fix SCOFuncs inclusion (bug 23324)
ISCFuncs was removed by commit 339ddc413559d4cb117a72f87b2a70dae6911c32.
SCOFuncs should be for SCO only, instead of !sun.
Also, remove comments that suggest ISC support.
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'Xtrans.c')
| -rw-r--r-- | Xtrans.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -72,7 +72,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 @@ -108,12 +108,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 */ }; |