summaryrefslogtreecommitdiff
path: root/sbin/route/show.c
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2004-11-17 01:47:21 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2004-11-17 01:47:21 +0000
commitea9351ad6e7abe8037e67138103e038dc61cc8e2 (patch)
tree12fa1b362bb119ac898e59e23e54c8eba193f553 /sbin/route/show.c
parent9d1a0f394346489b403a0639926ffc2d04372f01 (diff)
remove NI_WITHSCOPEID (which is not standard)
Diffstat (limited to 'sbin/route/show.c')
-rw-r--r--sbin/route/show.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sbin/route/show.c b/sbin/route/show.c
index 1b1973a98eb..b314f22a03a 100644
--- a/sbin/route/show.c
+++ b/sbin/route/show.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: show.c,v 1.38 2004/10/14 15:20:56 jaredy Exp $ */
+/* $OpenBSD: show.c,v 1.39 2004/11/17 01:47:20 itojun Exp $ */
/* $NetBSD: show.c,v 1.1 1996/11/15 18:01:41 gwr Exp $ */
/*
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "from: @(#)route.c 8.3 (Berkeley) 3/9/94";
#else
-static const char rcsid[] = "$OpenBSD: show.c,v 1.38 2004/10/14 15:20:56 jaredy Exp $";
+static const char rcsid[] = "$OpenBSD: show.c,v 1.39 2004/11/17 01:47:20 itojun Exp $";
#endif
#endif /* not lint */
@@ -452,11 +452,7 @@ routename6(struct sockaddr_in6 *sin6)
{
int niflags;
-#ifdef NI_WITHSCOPEID
- niflags = NI_WITHSCOPEID;
-#else
niflags = 0;
-#endif
if (nflag)
niflags |= NI_NUMERICHOST;
else
@@ -519,11 +515,7 @@ netname6(struct sockaddr_in6 *sa6, struct sockaddr_in6 *mask)
int i, lim, flag, error;
char hbuf[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
- flag = NI_WITHSCOPEID;
-#else
flag = 0;
-#endif
sin6 = *sa6;