===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/netstat/route.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/netstat/route.c	2003/02/12 14:41:08	1.51
--- src/usr.bin/netstat/route.c	2003/05/14 23:37:05	1.52
***************
*** 1,4 ****
! /*	$OpenBSD: route.c,v 1.51 2003/02/12 14:41:08 jason Exp $	*/
  /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: route.c,v 1.52 2003/05/14 23:37:05 itojun Exp $	*/
  /*	$NetBSD: route.c,v 1.15 1996/05/07 02:55:06 thorpej Exp $	*/
  
  /*
***************
*** 38,44 ****
  #if 0
  static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
  #else
! static char *rcsid = "$OpenBSD: route.c,v 1.51 2003/02/12 14:41:08 jason Exp $";
  #endif
  #endif /* not lint */
  
--- 38,44 ----
  #if 0
  static char sccsid[] = "from: @(#)route.c	8.3 (Berkeley) 3/9/94";
  #else
! static char *rcsid = "$OpenBSD: route.c,v 1.52 2003/05/14 23:37:05 itojun Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 233,239 ****
  #define	WID_GW(af)	18	/* width of gateway column */
  #else
  /* width of destination/gateway column */
! #ifdef KAME_SCOPEID
  /* strlen("fe80::aaaa:bbbb:cccc:dddd@gif0") == 30, strlen("/128") == 4 */
  #define	WID_DST(af)	((af) == AF_INET6 ? (nflag ? 34 : 18) : 18)
  #define	WID_GW(af)	((af) == AF_INET6 ? (nflag ? 30 : 18) : 18)
--- 233,239 ----
  #define	WID_GW(af)	18	/* width of gateway column */
  #else
  /* width of destination/gateway column */
! #if 1
  /* strlen("fe80::aaaa:bbbb:cccc:dddd@gif0") == 30, strlen("/128") == 4 */
  #define	WID_DST(af)	((af) == AF_INET6 ? (nflag ? 34 : 18) : 18)
  #define	WID_GW(af)	((af) == AF_INET6 ? (nflag ? 30 : 18) : 18)
***************
*** 479,485 ****
  	case AF_INET6:
  	    {
  		struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa;
! #ifdef KAME_SCOPEID
  		struct in6_addr *in6 = &sa6->sin6_addr;
  
  		/*
--- 479,485 ----
  	case AF_INET6:
  	    {
  		struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa;
! #ifdef __KAME__
  		struct in6_addr *in6 = &sa6->sin6_addr;
  
  		/*