diff options
| author | andre <andre@FreeBSD.org> | 2004-08-27 20:01:08 +0000 |
|---|---|---|
| committer | andre <andre@FreeBSD.org> | 2004-08-27 20:01:08 +0000 |
| commit | 26d581a5d1dcbb7c814babc1bb36633a52778de6 (patch) | |
| tree | 4051d58faf36dfcbec35d4f930209f1cbda98aa9 | |
| parent | dac065aa9f3d343b9fab419e59b382ad5567146e (diff) | |
| download | FreeBSD-src-26d581a5d1dcbb7c814babc1bb36633a52778de6.zip FreeBSD-src-26d581a5d1dcbb7c814babc1bb36633a52778de6.tar.gz | |
From __FreeBSD_version 600001 on PFIL_HOOKS is permanently in the kernel and
doesn't require to include opt_pfil_hooks.h.
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.c | 3 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c index 8b3412f..9ac3fb2 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.c +++ b/sys/contrib/ipfilter/netinet/ip_fil.c @@ -71,7 +71,8 @@ # if defined(_KERNEL) && !defined(IPFILTER_LKM) # include "opt_ipfilter.h" # endif -# if defined(_KERNEL) && (__FreeBSD_version >= 501108) && !defined(KLD_MODULE) +# if defined(_KERNEL) && (__FreeBSD_version >= 501108) && \ + (__FreeBSD_version < 600001) && !defined(KLD_MODULE) # include "opt_pfil_hooks.h" # endif #endif diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h index 4dc259a..aaca0dc 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.h +++ b/sys/contrib/ipfilter/netinet/ip_fil.h @@ -497,7 +497,7 @@ typedef struct ipflog { #if (defined(NetBSD) && (NetBSD > 199609) && (NetBSD <= 1991011)) || \ (defined(NetBSD1_2) && NetBSD1_2 > 1) || (defined(__FreeBSD_version) && \ (__FreeBSD_version >= 500011)) -# if (NetBSD >= 199905) +# if (NetBSD >= 199905) || (__FreeBSD_version >= 600001) # define PFIL_HOOKS # endif # ifdef PFIL_HOOKS |
