From 05cd71c899e83022147f27085ee652d26f5462cb Mon Sep 17 00:00:00 2001 From: Jesse Adkins Date: Sat, 6 Nov 2010 12:53:24 -0700 Subject: 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 Reviewed-by: Alan Coopersmith Signed-off-by: Alan Coopersmith --- Xtrans.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Xtrans.c') diff --git a/Xtrans.c b/Xtrans.c index 7b18f10..f59bd61 100644 --- a/Xtrans.c +++ b/Xtrans.c @@ -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 */ }; -- cgit v1.2.3