diff options
author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-11-17 01:47:21 +0000 |
---|---|---|
committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2004-11-17 01:47:21 +0000 |
commit | ea9351ad6e7abe8037e67138103e038dc61cc8e2 (patch) | |
tree | 12fa1b362bb119ac898e59e23e54c8eba193f553 /usr.bin/netstat/inet6.c | |
parent | 9d1a0f394346489b403a0639926ffc2d04372f01 (diff) |
remove NI_WITHSCOPEID (which is not standard)
Diffstat (limited to 'usr.bin/netstat/inet6.c')
-rw-r--r-- | usr.bin/netstat/inet6.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/usr.bin/netstat/inet6.c b/usr.bin/netstat/inet6.c index 9fe478b453b..a22eab3c404 100644 --- a/usr.bin/netstat/inet6.c +++ b/usr.bin/netstat/inet6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet6.c,v 1.30 2003/11/06 06:18:20 itojun Exp $ */ +/* $OpenBSD: inet6.c,v 1.31 2004/11/17 01:47:20 itojun Exp $ */ /* BSDI inet.c,v 2.3 1995/10/24 02:19:29 prb Exp */ /* * Copyright (c) 1983, 1988, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)inet.c 8.4 (Berkeley) 4/20/94"; #else -/*__RCSID("$OpenBSD: inet6.c,v 1.30 2003/11/06 06:18:20 itojun Exp $");*/ +/*__RCSID("$OpenBSD: inet6.c,v 1.31 2004/11/17 01:47:20 itojun Exp $");*/ /*__RCSID("KAME Id: inet6.c,v 1.10 2000/02/09 10:49:31 itojun Exp");*/ #endif #endif /* not lint */ @@ -1080,11 +1080,7 @@ inet6name(struct in6_addr *in6p) static int first = 1; char hbuf[NI_MAXHOST]; struct sockaddr_in6 sin6; -#ifdef NI_WITHSCOPEID - const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID; -#else const int niflag = NI_NUMERICHOST; -#endif if (first && !nflag) { first = 0; |