diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/in_pcb.h | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_ah.c | 5 | ||||
| -rw-r--r-- | sys/netinet/ip_esp.c | 8 | ||||
| -rw-r--r-- | sys/netinet/ip_ipsp.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ipsec_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet/tcp_debug.c | 4 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 6 |
7 files changed, 22 insertions, 19 deletions
diff --git a/sys/netinet/in_pcb.h b/sys/netinet/in_pcb.h index 228ebe5ea07..ed5f2932b61 100644 --- a/sys/netinet/in_pcb.h +++ b/sys/netinet/in_pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.h,v 1.21 2000/01/11 01:13:49 angelos Exp $ */ +/* $OpenBSD: in_pcb.h,v 1.22 2000/02/07 06:09:09 itojun Exp $ */ /* $NetBSD: in_pcb.h,v 1.14 1996/02/13 23:42:00 christos Exp $ */ /* @@ -66,9 +66,9 @@ */ #include <sys/queue.h> -#include <netinet6/ip6.h> +#include <netinet/ip6.h> #include <netinet6/ip6_var.h> -#include <netinet6/icmp6.h> +#include <netinet/icmp6.h> #include <netinet/ip_ipsp.h> union inpaddru { diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c index 39e54483cb9..b4a412b7a07 100644 --- a/sys/netinet/ip_ah.c +++ b/sys/netinet/ip_ah.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ah.c,v 1.33 2000/01/27 08:09:08 angelos Exp $ */ +/* $OpenBSD: ip_ah.c,v 1.34 2000/02/07 06:09:09 itojun Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -60,8 +60,7 @@ #include <netinet/ip.h> #ifdef INET6 -#include <netinet6/in6.h> -#include <netinet6/ip6.h> +#include <netinet/ip6.h> #endif /* INET6 */ #include <netinet/ip_ipsp.h> diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index e9cc0356dae..b6bf578d455 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.31 2000/01/27 08:09:09 angelos Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.32 2000/02/07 06:09:09 itojun Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -62,8 +62,10 @@ #endif /* INET */ #ifdef INET6 -#include <netinet6/in6.h> -#include <netinet6/ip6.h> +#ifndef INET +#include <netinet/in.h> +#endif +#include <netinet/ip6.h> #endif /* INET6 */ #include <netinet/ip_ipsp.h> diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c index 9dc7f9c30c0..d97c25a97f4 100644 --- a/sys/netinet/ip_ipsp.c +++ b/sys/netinet/ip_ipsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.c,v 1.77 2000/01/27 08:09:12 angelos Exp $ */ +/* $OpenBSD: ip_ipsp.c,v 1.78 2000/02/07 06:09:09 itojun Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -63,7 +63,9 @@ #endif /* INET */ #ifdef INET6 -#include <netinet6/in6.h> +#ifndef INET +#include <netinet/in.h> +#endif #include <netinet6/in6.h> #endif /* INET6 */ diff --git a/sys/netinet/ipsec_input.c b/sys/netinet/ipsec_input.c index 7249fbe5887..a46d2921356 100644 --- a/sys/netinet/ipsec_input.c +++ b/sys/netinet/ipsec_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec_input.c,v 1.18 2000/01/27 08:09:12 angelos Exp $ */ +/* $OpenBSD: ipsec_input.c,v 1.19 2000/02/07 06:09:09 itojun Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), @@ -69,8 +69,8 @@ #include <netinet/udp.h> #ifdef INET6 -#include <netinet6/in6.h> -#include <netinet6/ip6.h> +#include <netinet/in.h> +#include <netinet/ip6.h> #endif /* INET6 */ #include <netinet/ip_ipsp.h> diff --git a/sys/netinet/tcp_debug.c b/sys/netinet/tcp_debug.c index 13e1c89eb52..03d67ebb1a0 100644 --- a/sys/netinet/tcp_debug.c +++ b/sys/netinet/tcp_debug.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_debug.c,v 1.6 1999/12/08 06:50:20 itojun Exp $ */ +/* $OpenBSD: tcp_debug.c,v 1.7 2000/02/07 06:09:09 itojun Exp $ */ /* $NetBSD: tcp_debug.c,v 1.10 1996/02/13 23:43:36 christos Exp $ */ /* @@ -84,7 +84,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>. #ifndef INET #include <netinet/in.h> #endif -#include <netinet6/ip6.h> +#include <netinet/ip6.h> #endif /* INET6 */ #ifdef TCPDEBUG diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 25f22489ba7..aa082a2499b 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.37 2000/01/07 16:34:10 angelos Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.38 2000/02/07 06:09:09 itojun Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -87,10 +87,10 @@ extern int check_ipsec_policy __P((struct inpcb *, u_int32_t)); #ifndef INET #include <netinet/in.h> #endif -#include <netinet6/ip6.h> +#include <netinet/ip6.h> #include <netinet6/in6_var.h> #include <netinet6/ip6_var.h> -#include <netinet6/icmp6.h> +#include <netinet/icmp6.h> #include <netinet6/ip6protosw.h> extern int ip6_defhlim; |