[src/trunk]: src/sys to improve RFC2553/2292 compliance, and promote use of

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

details:   https://anonhg.NetBSD.org/src/rev/c18b8459977f
branches:  trunk
changeset: 481904:c18b8459977f
user:      itojun <itojun%NetBSD.org@localhost>
date:      Wed Feb 09 00:54:55 2000 +0000

description:
to improve RFC2553/2292 compliance, and promote use of
RFC2553/2292-compliant header file path, now the following headers are
forbidden:
        netinet6/ip6.h
        netinet6/icmp6.h
        netinet6/in6.h

if you want netinet6/{ip6,icmp6}.h, use netinet/{ip6,icmp6}.h.

if you want netinet6/in6.h, you just need to include netinet/in.h.
it pulls it in.
(we may need to integrate them into netinet/in.h, but for cross-BSD code
sharing i'd like to keep it like this for now)

diffstat:

 sys/netinet/in.h     |  4 +++-
 sys/netinet6/icmp6.h |  5 ++---
 sys/netinet6/in6.h   |  6 +++++-
 sys/netinet6/ip6.h   |  5 ++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r e60a6862e744 -r c18b8459977f sys/netinet/in.h
--- a/sys/netinet/in.h  Wed Feb 09 00:50:40 2000 +0000
+++ b/sys/netinet/in.h  Wed Feb 09 00:54:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in.h,v 1.44 1999/12/13 15:17:19 itojun Exp $   */
+/*     $NetBSD: in.h,v 1.45 2000/02/09 00:54:55 itojun Exp $   */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -368,7 +368,9 @@
 #endif /* !_XOPEN_SOURCE */
 
 /* INET6 stuff */
+#define __KAME_NETINET_IN_H_INCLUDED_
 #include <netinet6/in6.h>
+#undef __KAME_NETINET_IN_H_INCLUDED_
 
 #ifdef _KERNEL
 extern struct in_addr zeroin_addr;
diff -r e60a6862e744 -r c18b8459977f sys/netinet6/icmp6.h
--- a/sys/netinet6/icmp6.h      Wed Feb 09 00:50:40 2000 +0000
+++ b/sys/netinet6/icmp6.h      Wed Feb 09 00:54:55 2000 +0000
@@ -1,4 +1,3 @@
-/*     $NetBSD: icmp6.h,v 1.12 2000/02/07 03:51:59 itojun Exp $        */
+/*     $NetBSD: icmp6.h,v 1.13 2000/02/09 00:54:56 itojun Exp $        */
 
-/* just for backward compatibility, will go away soon */
-#include <netinet/icmp6.h>
+#error "wrong include file - include netinet/icmp6.h instead"
diff -r e60a6862e744 -r c18b8459977f sys/netinet6/in6.h
--- a/sys/netinet6/in6.h        Wed Feb 09 00:50:40 2000 +0000
+++ b/sys/netinet6/in6.h        Wed Feb 09 00:54:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in6.h,v 1.9 2000/01/06 15:46:09 itojun Exp $   */
+/*     $NetBSD: in6.h,v 1.10 2000/02/09 00:54:56 itojun Exp $  */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -64,6 +64,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 -r e60a6862e744 -r c18b8459977f sys/netinet6/ip6.h
--- a/sys/netinet6/ip6.h        Wed Feb 09 00:50:40 2000 +0000
+++ b/sys/netinet6/ip6.h        Wed Feb 09 00:54:55 2000 +0000
@@ -1,4 +1,3 @@
-/*     $NetBSD: ip6.h,v 1.8 2000/02/06 11:11:31 itojun Exp $   */
+/*     $NetBSD: ip6.h,v 1.9 2000/02/09 00:54:57 itojun Exp $   */
 
-/* just for backward compatibility, will go away soon */
-#include <netinet/ip6.h>
+#error "wrong include file - include netinet/ip6.h instead"