summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-01 13:44:17 +0000
committerEgbert Eich <eich@suse.de>2004-03-01 13:44:17 +0000
commit92124de8ea0c6bef80d85ef56124b94a9132df68 (patch)
tree8e7316329eef69572bd75fe162ba91dc80eb9bcc
parentd360b34f7f00ec1778437c94015b8228e6a5b270 (diff)
3. Added missing parts to XKB to make XEVIE branch compile (Egbert Eich).XEVIE
2. Merged with XORG-CURRENT branch to obtain a bugfix (Egbert Eich). 1. First add of SUN's XIVIE extension (Stuart Kreitman).
-rw-r--r--Xtranssock.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/Xtranssock.c b/Xtranssock.c
index 157876e..c439368 100644
--- a/Xtranssock.c
+++ b/Xtranssock.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.1.4.4 2003/12/15 16:00:01 kaleb Exp $ */
+/* $XdotOrg: xc/lib/xtrans/Xtranssock.c,v 1.1.4.6 2004/02/23 21:34:49 kaleb Exp $ */
/* $Xorg: Xtranssock.c,v 1.11 2001/02/09 02:04:06 xorgcvs Exp $ */
/*
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
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 @@ from the copyright holders.
#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 @@ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
#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