diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-02-09 07:37:16 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2000-02-09 07:37:16 +0000 |
| commit | 5e60d1c7d267e2d95330c8ed69faaf8effb0d089 (patch) | |
| tree | 2569ffc78b7cfbf0e3cb94020852d26338e515b5 /sys | |
| parent | 821d722ee332c1623290aa7f283c852043beaac1 (diff) | |
improve RFC2553/2292 conformance. netinet6/{ip6,icmp6,in6}.h should not
be included.
neitnet6/{ip6,icmp6}.h includes #error statements only - i'll remove them
couple of days later.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/in.h | 4 | ||||
| -rw-r--r-- | sys/netinet6/icmp6.h | 5 | ||||
| -rw-r--r-- | sys/netinet6/in6.h | 6 | ||||
| -rw-r--r-- | sys/netinet6/ip6.h | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/sys/netinet/in.h b/sys/netinet/in.h index e57cd11fece..a4d3a6dd673 100644 --- a/sys/netinet/in.h +++ b/sys/netinet/in.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in.h,v 1.37 2000/01/26 03:43:17 deraadt Exp $ */ +/* $OpenBSD: in.h,v 1.38 2000/02/09 07:37:14 itojun Exp $ */ /* $NetBSD: in.h,v 1.20 1996/02/13 23:41:47 christos Exp $ */ /* @@ -478,7 +478,9 @@ struct ip_mreq { } /* INET6 stuff */ +#define __KAME_NETINET_IN_H_INCLUDED_ #include <netinet6/in6.h> +#undef __KAME_NETINET_IN_H_INCLUDED_ #ifndef _KERNEL diff --git a/sys/netinet6/icmp6.h b/sys/netinet6/icmp6.h index 1cb6d336808..e54011002e7 100644 --- a/sys/netinet6/icmp6.h +++ b/sys/netinet6/icmp6.h @@ -1,4 +1,3 @@ -/* $OpenBSD: icmp6.h,v 1.6 2000/02/07 05:45:55 itojun Exp $ */ +/* $OpenBSD: icmp6.h,v 1.7 2000/02/09 07:37:15 itojun Exp $ */ -/* just for backward compatibility, will be nuked shortly */ -#include <netinet/icmp6.h> +#error "do not include netinet6/ip6.h, include netinet/ip6.h" diff --git a/sys/netinet6/in6.h b/sys/netinet6/in6.h index 4043de425f6..0ef0ccb076a 100644 --- a/sys/netinet6/in6.h +++ b/sys/netinet6/in6.h @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.h,v 1.9 1999/12/10 08:53:17 angelos Exp $ */ +/* $OpenBSD: in6.h,v 1.10 2000/02/09 07:37:15 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -63,6 +63,10 @@ * @(#)in.h 8.3 (Berkeley) 1/3/94 */ +#ifndef __KAME_NETINET_IN_H_INCLUDED_ +#error "do not include netinet6/in6.h directly, include netinet/in.h" +#endif + #ifndef _NETINET6_IN6_H_ #define _NETINET6_IN6_H_ diff --git a/sys/netinet6/ip6.h b/sys/netinet6/ip6.h index 7f9df6df148..f28729b5a46 100644 --- a/sys/netinet6/ip6.h +++ b/sys/netinet6/ip6.h @@ -1,4 +1,3 @@ -/* $OpenBSD: ip6.h,v 1.3 2000/02/07 05:45:55 itojun Exp $ */ +/* $OpenBSD: ip6.h,v 1.4 2000/02/09 07:37:15 itojun Exp $ */ -/* just for backward compatibility, will be nuked shortly */ -#include <netinet/ip6.h> +#error "do not include netinet6/ip6.h, include netinet/ip6.h" |