[src/trunk]: src/usr.sbin fix include file path (IPv6 related).

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0697a697223c
branches:  trunk
changeset: 481800:0697a697223c
user:      itojun <itojun%NetBSD.org@localhost>
date:      Sun Feb 06 11:21:45 2000 +0000

description:
fix include file path (IPv6 related).

diffstat:

 usr.sbin/mtrace6/mtrace6.c    |  5 ++---
 usr.sbin/rtadvd/config.c      |  6 +++---
 usr.sbin/setkey/parse.y       |  4 ++--
 usr.sbin/setkey/setkey.c      |  4 ++--
 usr.sbin/setkey/test-policy.c |  5 ++---
 usr.sbin/setkey/token.l       |  4 ++--
 usr.sbin/tcpdump/addrtoname.c |  6 +++---
 7 files changed, 16 insertions(+), 18 deletions(-)

diffs (141 lines):

diff -r 8bc0bb7408cf -r 0697a697223c usr.sbin/mtrace6/mtrace6.c
--- a/usr.sbin/mtrace6/mtrace6.c        Sun Feb 06 11:14:56 2000 +0000
+++ b/usr.sbin/mtrace6/mtrace6.c        Sun Feb 06 11:21:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mtrace6.c,v 1.1 2000/01/28 19:32:54 itojun Exp $       */
+/*     $NetBSD: mtrace6.c,v 1.2 2000/02/06 11:21:45 itojun Exp $       */
 
 /*
  * Copyright (C) 1999 WIDE Project.
@@ -42,9 +42,8 @@
 
 #include <netinet/in.h>
 
-#include <netinet6/in6.h>
 #include <netinet6/in6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 #include <string.h>
 #include <stdio.h>
diff -r 8bc0bb7408cf -r 0697a697223c usr.sbin/rtadvd/config.c
--- a/usr.sbin/rtadvd/config.c  Sun Feb 06 11:14:56 2000 +0000
+++ b/usr.sbin/rtadvd/config.c  Sun Feb 06 11:21:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.c,v 1.4 2000/02/02 04:07:50 itojun Exp $        */
+/*     $NetBSD: config.c,v 1.5 2000/02/06 11:21:46 itojun Exp $        */
 
 /*
  * Copyright (C) 1998 WIDE Project.
@@ -43,9 +43,9 @@
 
 #include <netinet/in.h>
 #include <netinet/in_var.h>
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/icmp6.h>
+#include <netinet/icmp6.h>
 
 #include <arpa/inet.h>
 
diff -r 8bc0bb7408cf -r 0697a697223c usr.sbin/setkey/parse.y
--- a/usr.sbin/setkey/parse.y   Sun Feb 06 11:14:56 2000 +0000
+++ b/usr.sbin/setkey/parse.y   Sun Feb 06 11:21:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: parse.y,v 1.3 2000/01/31 14:22:42 itojun Exp $ */
+/*     $NetBSD: parse.y,v 1.4 2000/02/06 11:21:47 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -37,7 +37,7 @@
 
 #include <net/route.h>
 #include <netinet/in.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
 #include <netkey/key_var.h>
 #include <netinet6/ipsec.h>
 #include <arpa/inet.h>
diff -r 8bc0bb7408cf -r 0697a697223c usr.sbin/setkey/setkey.c
--- a/usr.sbin/setkey/setkey.c  Sun Feb 06 11:14:56 2000 +0000
+++ b/usr.sbin/setkey/setkey.c  Sun Feb 06 11:21:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: setkey.c,v 1.3 2000/01/31 14:22:44 itojun Exp $        */
+/*     $NetBSD: setkey.c,v 1.4 2000/02/06 11:21:48 itojun Exp $        */
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -37,7 +37,7 @@
 #include <err.h>
 #include <net/route.h>
 #include <netinet/in.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
 #include <netkey/keydb.h>
 #include <netkey/key_debug.h>
 #include <netinet6/ipsec.h>
diff -r 8bc0bb7408cf -r 0697a697223c usr.sbin/setkey/test-policy.c
--- a/usr.sbin/setkey/test-policy.c     Sun Feb 06 11:14:56 2000 +0000
+++ b/usr.sbin/setkey/test-policy.c     Sun Feb 06 11:21:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: test-policy.c,v 1.2 1999/07/06 13:13:03 itojun Exp $   */
+/*     $NetBSD: test-policy.c,v 1.3 2000/02/06 11:21:49 itojun Exp $   */
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -33,8 +33,7 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <netinet6/in6.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
 #include <stdlib.h>
 #include <string.h>
 
diff -r 8bc0bb7408cf -r 0697a697223c usr.sbin/setkey/token.l
--- a/usr.sbin/setkey/token.l   Sun Feb 06 11:14:56 2000 +0000
+++ b/usr.sbin/setkey/token.l   Sun Feb 06 11:21:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: token.l,v 1.4 2000/01/31 14:22:45 itojun Exp $ */
+/*     $NetBSD: token.l,v 1.5 2000/02/06 11:21:49 itojun Exp $ */
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, and 1999 WIDE Project.
@@ -34,7 +34,7 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <net/route.h>
-#include <netkey/keyv2.h>
+#include <net/pfkeyv2.h>
 #include <netkey/keydb.h>
 #include <netkey/key_debug.h>
 #include <netinet/in.h>
diff -r 8bc0bb7408cf -r 0697a697223c usr.sbin/tcpdump/addrtoname.c
--- a/usr.sbin/tcpdump/addrtoname.c     Sun Feb 06 11:14:56 2000 +0000
+++ b/usr.sbin/tcpdump/addrtoname.c     Sun Feb 06 11:21:45 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: addrtoname.c,v 1.9 1999/12/10 05:45:07 itojun Exp $    */
+/*     $NetBSD: addrtoname.c,v 1.10 2000/02/06 11:21:52 itojun Exp $   */
 
 /*
  * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -29,7 +29,7 @@
 static const char rcsid[] =
     "@(#) Header: addrtoname.c,v 1.61 97/06/15 13:20:18 leres Exp  (LBL)";
 #else
-__RCSID("$NetBSD: addrtoname.c,v 1.9 1999/12/10 05:45:07 itojun Exp $");
+__RCSID("$NetBSD: addrtoname.c,v 1.10 2000/02/06 11:21:52 itojun Exp $");
 #endif
 #endif
 
@@ -53,7 +53,7 @@
 #include <arpa/inet.h>
 
 #ifdef INET6
-#include <netinet6/ip6.h>
+#include <netinet/ip6.h>
 #endif
 
 #include <ctype.h>