Module Name: src
Committed By: riastradh
Date: Thu Mar 5 07:46:36 UTC 2020
Modified Files:
src/sys/altq: altq_flowvalve.h
src/sys/dist/pf/net: pfvar.h
src/sys/net: slcompress.h
Log Message:
Need opt_inet.h for #ifdef INET, INET6.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/altq/altq_flowvalve.h
cvs rdiff -u -r1.22 -r1.23 src/sys/dist/pf/net/pfvar.h
cvs rdiff -u -r1.19 -r1.20 src/sys/net/slcompress.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/altq/altq_flowvalve.h
diff -u src/sys/altq/altq_flowvalve.h:1.3 src/sys/altq/altq_flowvalve.h:1.4
--- src/sys/altq/altq_flowvalve.h:1.3 Thu Oct 12 19:59:08 2006
+++ src/sys/altq/altq_flowvalve.h Thu Mar 5 07:46:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_flowvalve.h,v 1.3 2006/10/12 19:59:08 peter Exp $ */
+/* $NetBSD: altq_flowvalve.h,v 1.4 2020/03/05 07:46:36 riastradh Exp $ */
/* $KAME: altq_flowvalve.h,v 1.5 2002/04/03 05:38:50 kjc Exp $ */
/*
@@ -32,6 +32,10 @@
#ifdef _KERNEL
+#ifdef _KERNEL_OPT
+#include "opt_inet.h"
+#endif
+
/* fv_flow structure to define a unique address pair */
struct fv_flow {
int flow_af; /* address family */
Index: src/sys/dist/pf/net/pfvar.h
diff -u src/sys/dist/pf/net/pfvar.h:1.22 src/sys/dist/pf/net/pfvar.h:1.23
--- src/sys/dist/pf/net/pfvar.h:1.22 Thu Jun 5 23:48:16 2014
+++ src/sys/dist/pf/net/pfvar.h Thu Mar 5 07:46:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pfvar.h,v 1.22 2014/06/05 23:48:16 rmind Exp $ */
+/* $NetBSD: pfvar.h,v 1.23 2020/03/05 07:46:36 riastradh Exp $ */
/* $OpenBSD: pfvar.h,v 1.254 2007/07/13 09:17:48 markus Exp $ */
/*
@@ -34,6 +34,10 @@
#ifndef _NET_PFVAR_H_
#define _NET_PFVAR_H_
+#ifdef _KERNEL_OPT
+#include "opt_inet.h"
+#endif
+
#include <sys/param.h>
#include <sys/types.h>
#include <sys/queue.h>
Index: src/sys/net/slcompress.h
diff -u src/sys/net/slcompress.h:1.19 src/sys/net/slcompress.h:1.20
--- src/sys/net/slcompress.h:1.19 Mon Dec 12 15:58:45 2016
+++ src/sys/net/slcompress.h Thu Mar 5 07:46:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: slcompress.h,v 1.19 2016/12/12 15:58:45 maya Exp $ */
+/* $NetBSD: slcompress.h,v 1.20 2020/03/05 07:46:36 riastradh Exp $ */
/* Id: slcompress.h,v 1.4 1994/09/21 06:50:08 paulus Exp */
/*
@@ -42,6 +42,10 @@
#ifndef _NET_SLCOMPRESS_H_
#define _NET_SLCOMPRESS_H_
+#ifdef _KERNEL_OPT
+#include "opt_inet.h"
+#endif
+
#define MAX_STATES 16 /* must be > 2 and < 256 */
#define MAX_HDR MLEN /* XXX 4bsd-ism: should really be 128 */
