diff options
| author | Egbert Eich <eich@suse.de> | 2004-01-29 08:08:15 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-01-29 08:08:15 +0000 |
| commit | 871b8c33f2ab8c98b95aa3324bb70055f5207c61 (patch) | |
| tree | 4fc536e1488110e6069557c061fd9eac9e87a294 /Xtranssock.c | |
| parent | 352e5de72e125d7d474907f354462cc1442e0989 (diff) | |
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004xf86-012804-2330
Diffstat (limited to 'Xtranssock.c')
| -rw-r--r-- | Xtranssock.c | 4 |
1 files changed, 3 insertions, 1 deletions
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 |