diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:40 +0000 |
commit | acb541bcf33fc15b75adf872605734fd730f9168 (patch) | |
tree | 5a5fad5f038ddf02d4b343adb219848ae68f7b1f /Xtranslcl.c | |
parent | d93c194ca393697cd053d63ed7546d48735a6990 (diff) |
merge latest (4.3.99.16) from XFree86 (vendor) branch
Diffstat (limited to 'Xtranslcl.c')
-rw-r--r-- | Xtranslcl.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/Xtranslcl.c b/Xtranslcl.c index f92d6f8..352f360 100644 --- a/Xtranslcl.c +++ b/Xtranslcl.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.39 2002/11/26 01:12:30 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.41 2003/08/26 15:38:39 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -2325,7 +2325,7 @@ TRANS(LocalSetOption)(XtransConnInfo ciptr, int option, int arg) #ifdef TRANS_SERVER static int -TRANS(LocalCreateListener)(XtransConnInfo ciptr, char *port) +TRANS(LocalCreateListener)(XtransConnInfo ciptr, char *port, unsigned int flags) { PRMSG(2,"LocalCreateListener(%x->%d,%s)\n",ciptr,ciptr->fd,port); @@ -2495,6 +2495,21 @@ TRANS(LocalCloseForCloning)(XtransConnInfo ciptr) * call to SelectTransport() in Xtrans.c. */ +#ifdef TRANS_SERVER +static char * local_aliases[] = { +# ifndef sun + "pts", +# endif + "named", +# ifndef sun +# ifndef SCO325 + "isc", +# endif + "sco", +# endif + NULL }; +#endif + Xtransport TRANS(LocalFuncs) = { /* Local Interface */ "local", @@ -2503,6 +2518,7 @@ Xtransport TRANS(LocalFuncs) = { TRANS(LocalOpenCOTSClient), #endif /* TRANS_CLIENT */ #ifdef TRANS_SERVER + local_aliases, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ #ifdef TRANS_CLIENT @@ -2544,6 +2560,7 @@ Xtransport TRANS(PTSFuncs) = { TRANS(LocalOpenCOTSClient), #endif /* TRANS_CLIENT */ #ifdef TRANS_SERVER + NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ #ifdef TRANS_CLIENT @@ -2585,6 +2602,7 @@ Xtransport TRANS(NAMEDFuncs) = { TRANS(LocalOpenCOTSClient), #endif /* TRANS_CLIENT */ #ifdef TRANS_SERVER + NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ #ifdef TRANS_CLIENT @@ -2626,6 +2644,7 @@ Xtransport TRANS(ISCFuncs) = { TRANS(LocalOpenCOTSClient), #endif /* TRANS_CLIENT */ #ifdef TRANS_SERVER + NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ #ifdef TRANS_CLIENT @@ -2665,6 +2684,7 @@ Xtransport TRANS(SCOFuncs) = { TRANS(LocalOpenCOTSClient), #endif /* TRANS_CLIENT */ #ifdef TRANS_SERVER + NULL, TRANS(LocalOpenCOTSServer), #endif /* TRANS_SERVER */ #ifdef TRANS_CLIENT |