[Xorg-commit] xc/lib/SM sm_genid.c,1.1.4.2,1.1.4.3 sm_manager.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/lib/SM
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/lib/SM

Modified Files:
      Tag: XORG-CURRENT
	sm_genid.c sm_manager.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: sm_genid.c
===================================================================
RCS file: /cvs/xorg/xc/lib/SM/sm_genid.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/sm_genid.c	26 Nov 2003 22:48:35 -0000	1.1.4.2
+++ b/sm_genid.c	23 Feb 2004 21:34:18 -0000	1.1.4.3
@@ -25,7 +25,7 @@
 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 @@
     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) {

Index: sm_manager.c
===================================================================
RCS file: /cvs/xorg/xc/lib/SM/sm_manager.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/sm_manager.c	14 Nov 2003 15:54:36 -0000	1.1
+++ b/sm_manager.c	23 Feb 2004 21:34:18 -0000	1.1.4.1
@@ -34,6 +34,9 @@
 #include "SMlibint.h"
 #include <X11/Xtrans.h>
 
+#ifdef __USLC__
+#undef shutdown
+#endif
 
 
 Status