diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-20 00:28:22 +0000 |
| commit | d360b34f7f00ec1778437c94015b8228e6a5b270 (patch) | |
| tree | 4c53ae9ffb1195b7ea8f3ad04b5c462d472b008f | |
| parent | 5cd2a5fd3e2d3b7cbd0741bf4228998daecf8e51 (diff) | |
merge XFree86 RC2 (4.3.99.902) from vendor branchXEVIE-BASE
| -rw-r--r-- | Xtrans.c | 5 | ||||
| -rw-r--r-- | Xtranssock.c | 12 |
2 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,4 @@ +/* $XdotOrg: Xtrans.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* $Xorg: Xtrans.c,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* @@ -26,7 +27,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.33 2003/08/11 17:41:29 eich Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.34 2003/12/05 05:12:50 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -783,7 +784,7 @@ TRANS(NoListen) (char * protocol) if ((trans = TRANS(SelectTransport)(protocol)) == NULL) { - PRMSG (1,"TRANS(TransNoListen): unable to find transport: %s\n", + PRMSG (1,"TransNoListen: unable to find transport: %s\n", protocol, 0, 0); return -1; diff --git a/Xtranssock.c b/Xtranssock.c index f1244f6..157876e 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -1,4 +1,4 @@ -/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */ +/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.1.4.4 2003/12/15 16:00:01 kaleb Exp $ */ /* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */ /* @@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the copyright holders. */ -/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.66 2003/12/02 20:00:09 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.67 2003/12/05 05:12:50 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -2219,7 +2219,13 @@ TRANS(SocketUNIXCloseForCloning) (XtransConnInfo ciptr) #ifdef TCPCONN # ifdef TRANS_SERVER -static char* tcp_nolisten[] = { "inet", "inet6", NULL }; +static char* tcp_nolisten[] = { + "inet", +#if defined(IPv6) && defined(AF_INET6) + "inet6", +#endif + NULL +}; # endif Xtransport TRANS(SocketTCPFuncs) = { |