diff options
| -rw-r--r-- | Xtrans.c | 3 | ||||
| -rw-r--r-- | Xtrans.h | 2 | ||||
| -rw-r--r-- | Xtransdnet.c | 2 | ||||
| -rw-r--r-- | Xtransint.h | 3 | ||||
| -rw-r--r-- | Xtranslcl.c | 2 | ||||
| -rw-r--r-- | Xtransos2.c | 2 | ||||
| -rw-r--r-- | Xtranssock.c | 12 | ||||
| -rw-r--r-- | Xtranstli.c | 2 | ||||
| -rw-r--r-- | Xtransutil.c | 6 | ||||
| -rw-r--r-- | transport.c | 2 |
10 files changed, 20 insertions, 16 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.34 2003/12/05 05:12:50 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.c,v 3.33 2003/08/11 17:41:29 eich Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.22 2003/07/24 13:50:19 eich Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtrans.h,v 3.21 2003/07/20 16:12:15 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/Xtransdnet.c b/Xtransdnet.c index 40b08b3..9bc3e17 100644 --- a/Xtransdnet.c +++ b/Xtransdnet.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.8 2003/08/26 15:38:39 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransdnet.c,v 3.7tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/Xtransint.h b/Xtransint.h index 9d3c464..50a41cc 100644 --- a/Xtransint.h +++ b/Xtransint.h @@ -1,3 +1,4 @@ +/* $XdotOrg: Xtransint.h,v 1.4 2001/02/09 02:04:06 xorgcvs Exp $ */ /* $Xorg: Xtransint.h,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/Xtransint.h,v 3.42 2003/11/29 01:48:28 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransint.h,v 3.41 2003/08/28 00:35:23 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/Xtranslcl.c b/Xtranslcl.c index 352f360..fd68289 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.41 2003/08/26 15:38:39 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranslcl.c,v 3.40tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/Xtransos2.c b/Xtransos2.c index f61617e..f4a6b03 100644 --- a/Xtransos2.c +++ b/Xtransos2.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/lib/xtrans/Xtransos2.c,v 3.10 2003/08/26 15:38:39 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransos2.c,v 3.9tsi Exp $ */ /* * (c) Copyright 1996 by Sebastien Marineau and Holger Veit diff --git a/Xtranssock.c b/Xtranssock.c index 7c3ee8d..0609c90 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */ /* @@ -27,7 +28,7 @@ other dealings in this Software without prior written authorization from the copyright holders. */ -/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.69 2004/02/14 00:10:13 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.68 2004/01/07 04:28:02 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -87,7 +88,7 @@ from the copyright holders. #endif #ifndef NO_TCP_H -#if defined(__osf__) || defined(linux) +#if defined(__osf__) || defined(linux) || defined(AIXV5) #include <sys/param.h> #endif /* osf */ #if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) @@ -864,9 +865,10 @@ TRANS(SocketCreateListener) (XtransConnInfo ciptr, if (errno == EADDRINUSE) { if (flags & ADDR_IN_USE_ALLOWED) break; - } else - return TRANS_ADDR_IN_USE; - + else + return TRANS_ADDR_IN_USE; + } + if (retry-- == 0) { PRMSG (1, "SocketCreateListener: failed to bind listener\n", 0, 0, 0); diff --git a/Xtranstli.c b/Xtranstli.c index 9f686c4..d8b5db8 100644 --- a/Xtranstli.c +++ b/Xtranstli.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.13 2003/08/26 15:38:39 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtranstli.c,v 3.12tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * diff --git a/Xtransutil.c b/Xtransutil.c index c3757ca..865c20f 100644 --- a/Xtransutil.c +++ b/Xtransutil.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.27 2003/07/18 15:53:24 tsi Exp $ */ +/* $XFree86: xc/lib/xtrans/Xtransutil.c,v 3.26 2003/07/09 15:27:30 tsi Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -573,14 +573,14 @@ trans_mkdir(char *path, int mode) if (updateOwner && !updatedOwner) { PRMSG(1, "mkdir: Owner of %s should be set to root\n", path, 0, 0); -#if !defined(__CYGWIN__) && !defined(__DARWIN__) +#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__) sleep(5); #endif } if (updateMode && !updatedMode) { PRMSG(1, "mkdir: Mode of %s should be set to %04o\n", path, mode, 0); -#if !defined(__CYGWIN__) && !defined(__DARWIN__) +#if 0 && !defined(__CYGWIN__) && !defined(__DARWIN__) sleep(5); #endif } diff --git a/transport.c b/transport.c index e00a82a..ff460c2 100644 --- a/transport.c +++ b/transport.c @@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/xtrans/transport.c,v 3.10 2003/03/25 04:18:15 dawes Exp $ */ +/* $XFree86: xc/lib/xtrans/transport.c,v 3.9 2002/05/31 18:45:51 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * |