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 --- Xtranslcl.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'Xtranslcl.c') 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 -- cgit v1.2.3