diff options
| author | scottl <scottl@FreeBSD.org> | 2004-12-25 00:22:25 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2004-12-25 00:22:25 +0000 |
| commit | 86ae6cb5900b3aaa4d04e6d556f3ec9d6b8ee908 (patch) | |
| tree | 6c28f500feccaa75fc5a34a92280e8b90ce26b4a /sys/contrib | |
| parent | 7631cf38015799fbd6d3d0a773959028181ffeb8 (diff) | |
| download | FreeBSD-src-86ae6cb5900b3aaa4d04e6d556f3ec9d6b8ee908.zip FreeBSD-src-86ae6cb5900b3aaa4d04e6d556f3ec9d6b8ee908.tar.gz | |
Sprinkle in some __FreeBSD_version checks so that this compiles again. Don't
define PFIL_HOOKS anymore.
Submitted by: keramida
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/fil.c | 4 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.c | 3 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sys/contrib/ipfilter/netinet/fil.c b/sys/contrib/ipfilter/netinet/fil.c index e214fff..5687e8f 100644 --- a/sys/contrib/ipfilter/netinet/fil.c +++ b/sys/contrib/ipfilter/netinet/fil.c @@ -115,10 +115,10 @@ extern int opts; # define FR_VERBOSE(verb_pr) # define FR_DEBUG(verb_pr) # define IPLLOG(a, c, d, e) ipflog(a, c, d, e) -# if SOLARIS || defined(__sgi) +# if SOLARIS || defined(__sgi) || (__FreeBSD_version >= 500043) extern KRWLOCK_T ipf_mutex, ipf_auth, ipf_nat; extern kmutex_t ipf_rw; -# endif /* SOLARIS || __sgi */ +# endif /* SOLARIS || __sgi || __FreeBSD_version */ #endif /* _KERNEL */ diff --git a/sys/contrib/ipfilter/netinet/ip_fil.c b/sys/contrib/ipfilter/netinet/ip_fil.c index 954f540..b3d5ef7 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.c +++ b/sys/contrib/ipfilter/netinet/ip_fil.c @@ -171,6 +171,9 @@ static int ipfr_fastroute6 __P((struct mbuf *, struct mbuf **, extern int tcp_mtudisc; extern kmutex_t ipf_rw; extern KRWLOCK_T ipf_mutex; +# elif (__FreeBSD_version >= 500043) +extern kmutex_t ipf_rw; +extern KRWLOCK_T ipf_mutex; # endif #else void init_ifp __P((void)); diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h index aaca0dc..4dc259a 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) || (__FreeBSD_version >= 600001) +# if (NetBSD >= 199905) # define PFIL_HOOKS # endif # ifdef PFIL_HOOKS |
