[PATCH libxtrans] Remove ISCFuncs, fix SCOFuncs inclusion (bug 23324)

[jesserayadkins at gmail.com]

From: Jesse Adkins <jesserayadkins at gmail.com>

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 at gmail.com>
---
 Xtrans.c    |   10 ++++------
 Xtranslcl.c |   12 +++---------
 2 files changed, 7 insertions(+), 15 deletions(-)

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 */
 };
 
diff --git a/Xtranslcl.c b/Xtranslcl.c
index cb5836c..ca04e7f 100644
--- a/Xtranslcl.c
+++ b/Xtranslcl.c
@@ -102,7 +102,6 @@ from The Open Group.
 /* Types of local connections supported:
  *  - PTS
  *  - named pipes
- *  - ISC
  *  - SCO
  */
 #if !defined(sun)
@@ -250,11 +249,6 @@ static void _dummy(int sig)
 #else
 #define NAMEDNODENAME "/dev/X/Nserver."
 
-/*
- * ISC is only defined for X11 since they are there for
- * backwards binary compatability only.
- */
-
 #define SCORNODENAME	"/dev/X%1sR"
 #define SCOSNODENAME	"/dev/X%1sS"
 #endif /* !sun */
@@ -936,7 +930,7 @@ TRANS(NAMEDAccept)(XtransConnInfo ciptr, XtransConnInfo newciptr, int *status)
 #if defined(LOCAL_TRANS_SCO)
 
 /*
- * connect_spipe is used by the SCO and ISC connection types.
+ * connect_spipe is used by the SCO connection type.
  */
 static int
 connect_spipe(int fd1, int fd2)
@@ -961,7 +955,7 @@ connect_spipe(int fd1, int fd2)
 }
 
 /*
- * named_spipe is used by the SCO and ISC connection types.
+ * named_spipe is used by the SCO connection type.
  */
 
 static int
@@ -1675,7 +1669,7 @@ static	char	*freeXLOCAL=NULL;
 #elif defined(sun)
 #define DEF_XLOCAL "UNIX:NAMED"
 #else
-#define DEF_XLOCAL "UNIX:PTS:NAMED:ISC:SCO"
+#define DEF_XLOCAL "UNIX:PTS:NAMED:SCO"
 #endif
 
 static void
-- 
1.7.1