[src/trunk]: src/sys/netipsec opt_inet6.h is FreeBSD-specific, so wrap it wit...

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

details:   https://anonhg.NetBSD.org/src/rev/a8753c7511ca
branches:  trunk
changeset: 550764:a8753c7511ca
user:      jonathan <jonathan%NetBSD.org@localhost>
date:      Wed Aug 20 22:33:40 2003 +0000

description:
opt_inet6.h is FreeBSD-specific, so wrap it with #ifdef __FreeBSD__/#endif.

diffstat:

 sys/netipsec/ipsec.c        |  6 ++++--
 sys/netipsec/ipsec_input.c  |  6 ++++--
 sys/netipsec/ipsec_mbuf.c   |  6 ++++--
 sys/netipsec/ipsec_output.c |  6 ++++--
 sys/netipsec/key.c          |  6 ++++--
 sys/netipsec/key_debug.c    |  6 ++++--
 sys/netipsec/xform_ah.c     |  6 ++++--
 sys/netipsec/xform_esp.c    |  6 ++++--
 sys/netipsec/xform_ipcomp.c |  6 ++++--
 sys/netipsec/xform_ipip.c   |  6 +++---
 10 files changed, 39 insertions(+), 21 deletions(-)

diffs (243 lines):

diff -r 234573a6591f -r a8753c7511ca sys/netipsec/ipsec.c
--- a/sys/netipsec/ipsec.c      Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/ipsec.c      Wed Aug 20 22:33:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec.c,v 1.1 2003/08/13 20:06:50 jonathan Exp $       */
+/*     $NetBSD: ipsec.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $       */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $       */
 /*     $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
@@ -32,14 +32,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.1 2003/08/13 20:06:50 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $");
 
 /*
  * IPsec controller part.
  */
 
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 #include "opt_ipsec.h"
 
 #include <sys/param.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/ipsec_input.c
--- a/sys/netipsec/ipsec_input.c        Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/ipsec_input.c        Wed Aug 20 22:33:40 2003 +0000
@@ -1,16 +1,18 @@
-/*     $NetBSD: ipsec_input.c,v 1.3 2003/08/15 17:14:31 jonathan Exp $ */
+/*     $NetBSD: ipsec_input.c,v 1.4 2003/08/20 22:33:40 jonathan Exp $ */
 /*     $FreeBSD: src/sys/netipsec/ipsec_input.c,v 1.2.4.1 2003/01/24 05:11:35 sam Exp $        */
 /*     $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.3 2003/08/15 17:14:31 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_input.c,v 1.4 2003/08/20 22:33:40 jonathan Exp $");
 
 /*
  * IPsec input processing.
  */
 
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 #include "opt_ipsec.h"
 
 #include <sys/param.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/ipsec_mbuf.c
--- a/sys/netipsec/ipsec_mbuf.c Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/ipsec_mbuf.c Wed Aug 20 22:33:40 2003 +0000
@@ -1,14 +1,16 @@
-/*     $NetBSD: ipsec_mbuf.c,v 1.2 2003/08/13 20:13:59 jonathan Exp $  */
+/*     $NetBSD: ipsec_mbuf.c,v 1.3 2003/08/20 22:33:40 jonathan Exp $  */
 /*     $FreeBSD: src/sys/netipsec/ipsec_mbuf.c,v 1.5.2.1 2003/01/24 05:11:35 sam Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.2 2003/08/13 20:13:59 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_mbuf.c,v 1.3 2003/08/20 22:33:40 jonathan Exp $");
 
 /*
  * IPsec-specific mbuf routines.
  */
 
+#ifdef __FreeBSD__
 #include "opt_param.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/ipsec_output.c
--- a/sys/netipsec/ipsec_output.c       Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/ipsec_output.c       Wed Aug 20 22:33:40 2003 +0000
@@ -1,15 +1,17 @@
-/*     $NetBSD: ipsec_output.c,v 1.3 2003/08/15 17:14:31 jonathan Exp $        */
+/*     $NetBSD: ipsec_output.c,v 1.4 2003/08/20 22:33:40 jonathan Exp $        */
 /*     $FreeBSD: src/sys/netipsec/ipsec_output.c,v 1.3.2.1 2003/01/24 05:11:35 sam Exp $       */
 /*     $KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $ */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.3 2003/08/15 17:14:31 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.4 2003/08/20 22:33:40 jonathan Exp $");
 
 /*
  * IPsec output processing.
  */
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 #include "opt_ipsec.h"
 
 #include <sys/param.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/key.c
--- a/sys/netipsec/key.c        Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/key.c        Wed Aug 20 22:33:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $ */
+/*     $NetBSD: key.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $ */
 /*     $FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/key.c,v 1.3.2.2 2003/07/01 01:38:13 sam Exp $ */
 /*     $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $   */
 
@@ -32,14 +32,16 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $");
 
 /*
  * This code is referd to RFC 2367
  */
 
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 #include "opt_ipsec.h"
 
 #include <sys/types.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/key_debug.c
--- a/sys/netipsec/key_debug.c  Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/key_debug.c  Wed Aug 20 22:33:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: key_debug.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $   */
+/*     $NetBSD: key_debug.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $   */
 /*     $FreeBSD: src/sys/netipsec/key_debug.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $KAME: key_debug.c,v 1.26 2001/06/27 10:46:50 sakane Exp $      */
 
@@ -33,11 +33,13 @@
 
 #ifdef _KERNEL
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key_debug.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $");
 #endif
 
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 #include "opt_ipsec.h"
 
 #include <sys/types.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/xform_ah.c
--- a/sys/netipsec/xform_ah.c   Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/xform_ah.c   Wed Aug 20 22:33:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ah.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $    */
+/*     $NetBSD: xform_ah.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $    */
 /*     $FreeBSD: src/sys/netipsec/xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $   */
 /*     $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
 /*
@@ -39,10 +39,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.2 2003/08/20 22:33:40 jonathan Exp $");
 
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/xform_esp.c
--- a/sys/netipsec/xform_esp.c  Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/xform_esp.c  Wed Aug 20 22:33:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_esp.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $   */
+/*     $NetBSD: xform_esp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $   */
 /*     $FreeBSD: src/sys/netipsec/xform_esp.c,v 1.2.2.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $OpenBSD: ip_esp.c,v 1.69 2001/06/26 06:18:59 angelos Exp $ */
 
@@ -39,10 +39,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.1 2003/08/13 20:06:51 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_esp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $");
 
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/xform_ipcomp.c
--- a/sys/netipsec/xform_ipcomp.c       Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/xform_ipcomp.c       Wed Aug 20 22:33:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipcomp.c,v 1.1 2003/08/13 20:06:52 jonathan Exp $        */
+/*     $NetBSD: xform_ipcomp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $        */
 /*     $FreeBSD: src/sys/netipsec/xform_ipcomp.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $       */
 /* $OpenBSD: ip_ipcomp.c,v 1.1 2001/07/05 12:08:52 jjbg Exp $ */
 
@@ -30,11 +30,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.1 2003/08/13 20:06:52 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipcomp.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $");
 
 /* IP payload compression protocol (IPComp), see RFC 2393 */
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r 234573a6591f -r a8753c7511ca sys/netipsec/xform_ipip.c
--- a/sys/netipsec/xform_ipip.c Wed Aug 20 21:48:35 2003 +0000
+++ b/sys/netipsec/xform_ipip.c Wed Aug 20 22:33:40 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipip.c,v 1.1 2003/08/13 20:06:52 jonathan Exp $  */
+/*     $NetBSD: xform_ipip.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $  */
 /*     $FreeBSD: src/sys/netipsec/xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
 /*     $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 
@@ -39,14 +39,14 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.1 2003/08/13 20:06:52 jonathan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.2 2003/08/20 22:33:41 jonathan Exp $");
 
 /*
  * IP-inside-IP processing
  */
 #include "opt_inet.h"
+#ifdef __FreeBSD__
 #include "opt_inet6.h"
-#ifdef __FreeBSD__
 #include "opt_random_ip_id.h"  
 #endif /* __FreeBSD__ */