diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-19 20:54:45 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-12-19 20:54:45 +0000 |
commit | 352e5de72e125d7d474907f354462cc1442e0989 (patch) | |
tree | ea7ff5e3a408a4b87772ede9c4c6c410d5fc57dd | |
parent | d223c1bb16c503e58f07dfef14b8e79fe7c358ff (diff) |
XFree86 4.3.99.902 (RC 2)xf86-4_3_99_902
-rw-r--r-- | Xtrans.c | 4 | ||||
-rw-r--r-- | Xtranssock.c | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -26,7 +26,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 +783,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 788928c..0e6019e 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -27,7 +27,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 * @@ -2218,7 +2218,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) = { |