From 871b8c33f2ab8c98b95aa3324bb70055f5207c61 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 29 Jan 2004 08:08:15 +0000 Subject: Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 --- Xtranssock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Xtranssock.c b/Xtranssock.c index 0e6019e..23b3ae3 100644 --- a/Xtranssock.c +++ b/Xtranssock.c @@ -27,7 +27,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.68 2004/01/07 04:28:02 dawes Exp $ */ /* Copyright 1993, 1994 NCR Corporation - Dayton, Ohio, USA * @@ -281,7 +281,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 -- cgit v1.2.3