diff options
| -rw-r--r-- | src/SMlibint.h | 2 | ||||
| -rw-r--r-- | src/globals.h | 2 | ||||
| -rw-r--r-- | src/sm_auth.c | 2 | ||||
| -rw-r--r-- | src/sm_error.c | 2 | ||||
| -rw-r--r-- | src/sm_genid.c | 2 | ||||
| -rw-r--r-- | src/sm_manager.c | 3 | ||||
| -rw-r--r-- | src/sm_process.c | 2 |
7 files changed, 9 insertions, 6 deletions
diff --git a/src/SMlibint.h b/src/SMlibint.h index 2e559de..e9fa9cd 100644 --- a/src/SMlibint.h +++ b/src/SMlibint.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/SMlibint.h,v 1.4 2001/12/14 19:53:55 dawes Exp $ */ +/* $XFree86: xc/lib/SM/SMlibint.h,v 1.3 2001/07/29 05:01:11 tsi Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/src/globals.h b/src/globals.h index b3ef69f..2f26a78 100644 --- a/src/globals.h +++ b/src/globals.h @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/globals.h,v 1.5 2002/05/31 18:45:41 dawes Exp $ */ +/* $XFree86: xc/lib/SM/globals.h,v 1.4 2001/12/14 19:53:55 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/src/sm_auth.c b/src/sm_auth.c index 7057fd6..111235e 100644 --- a/src/sm_auth.c +++ b/src/sm_auth.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_auth.c,v 1.4 2003/10/23 21:38:22 tsi Exp $ */ +/* $XFree86$ */ /* * Author: Ralph Mor, X Consortium diff --git a/src/sm_error.c b/src/sm_error.c index 728de79..8cd7989 100644 --- a/src/sm_error.c +++ b/src/sm_error.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_error.c,v 1.3 2001/12/14 19:53:55 dawes Exp $ */ +/* $XFree86: xc/lib/SM/sm_error.c,v 1.2 2001/10/28 03:32:29 tsi Exp $ */ /* * Author: Ralph Mor, X Consortium diff --git a/src/sm_genid.c b/src/sm_genid.c index 8771d07..67b3317 100644 --- a/src/sm_genid.c +++ b/src/sm_genid.c @@ -136,7 +136,7 @@ SmsGenerateClientID (smsConn) struct in_addr *haddr = NULL; #if defined(IPv6) && defined(AF_INET6) struct addrinfo *ai, *first_ai; - if (getaddrinfo(hostname,NULL,NULL,&ai) == 0) + if (getaddrinfo(hostname,NULL,NULL,&ai) != 0) return NULL; for (first_ai = ai; ai != NULL; ai = ai->ai_next) { diff --git a/src/sm_manager.c b/src/sm_manager.c index 2f62b15..5c7cc55 100644 --- a/src/sm_manager.c +++ b/src/sm_manager.c @@ -34,6 +34,9 @@ in this Software without prior written authorization from The Open Group. #include "SMlibint.h" #include <X11/Xtrans.h> +#ifdef __USLC__ +#undef shutdown +#endif Status diff --git a/src/sm_process.c b/src/sm_process.c index 44f088b..8f913f0 100644 --- a/src/sm_process.c +++ b/src/sm_process.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/SM/sm_process.c,v 1.3 2003/05/27 22:26:25 tsi Exp $ */ +/* $XFree86$ */ /* * Author: Ralph Mor, X Consortium |