[Xorg-commit] xc/lib/xtrans Xtranssock.c,1.1.4.5,1.1.4.6

[Kaleb Keithley]

Committed by: kaleb

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

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


Index: Xtranssock.c
===================================================================
RCS file: /cvs/xorg/xc/lib/xtrans/Xtranssock.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/Xtranssock.c	20 Dec 2003 00:28:22 -0000	1.1.4.5
+++ b/Xtranssock.c	23 Feb 2004 21:34:49 -0000	1.1.4.6
@@ -28,7 +28,7 @@
 from the copyright holders.
 
 */
-/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.67 2003/12/05 05:12:50 dawes Exp $ */
+/* $XFree86: xc/lib/xtrans/Xtranssock.c,v 3.69 2004/02/14 00:10:13 dawes Exp $ */
 
 /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA
  *
@@ -83,7 +83,7 @@
 #include <sys/stat.h>
 #endif
 
-#if defined(hpux) || defined(__UNIXOS2__) || (defined(MOTOROLA) && defined(SYSV))
+#if defined(hpux) || (defined(MOTOROLA) && defined(SYSV))
 #define NO_TCP_H
 #endif 
 
@@ -282,7 +282,9 @@
 #if defined(IPv6) && defined(AF_INET6)
 static const struct in6_addr local_in6addr_any = IN6ADDR_ANY_INIT;
 #pragma weak in6addr_any = local_in6addr_any
+#ifndef __USLC__
 #pragma weak getaddrinfo
+#endif
 static int haveIPv6 = 1;
 #endif