diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:34:18 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2004-02-23 21:34:18 +0000 |
| commit | 0cf683dc257e0e6d2cd77d47010c6ce6fae99012 (patch) | |
| tree | 7b0123ac29a82d85019f3e1fa2b8984541d936a2 /src | |
| parent | 09ca1da2938f5086eddad61f589cd7d4a865f80f (diff) | |
merge most of XFree86 RC3 (4.3.99.903) from vendor branch. bug #214XORG-RELEASE-1-BASEXEVIE-MERGEXINERAMA_2
Diffstat (limited to 'src')
| -rw-r--r-- | src/sm_genid.c | 4 | ||||
| -rw-r--r-- | src/sm_manager.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/sm_genid.c b/src/sm_genid.c index 8771d07..01e6e35 100644 --- a/src/sm_genid.c +++ b/src/sm_genid.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_genid.c,v 3.17 2003/07/09 15:27:28 tsi Exp $ */ +/* $XFree86: xc/lib/SM/sm_genid.c,v 3.18 2004/01/20 03:36:27 dawes Exp $ */ /* * Author: Ralph Mor, X Consortium @@ -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 |