8c8
< * $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_compat.h 92685 2002-03-19 11:44:16Z darrenr $
---
> * $FreeBSD: head/sys/contrib/ipfilter/netinet/ip_compat.h 95418 2002-04-25 03:31:39Z darrenr $
107d106
<
201,204d199
< #if defined(__FreeBSD__) && (__FreeBSD__ >= 5) && defined(_KERNEL)
< # include <machine/in_cksum.h>
< #endif
<
218a214,237
> #if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL))
> # include <sys/param.h>
> # ifndef __FreeBSD_version
> # include <sys/osreldate.h>
> # endif
> # ifdef IPFILTER_LKM
> # define ACTUALLY_LKM_NOT_KERNEL
> # endif
> # if defined(__FreeBSD_version) && (__FreeBSD_version < 300000)
> # include <machine/spl.h>
> # else
> # if (__FreeBSD_version >= 300000) && (__FreeBSD_version < 400000)
> # if defined(IPFILTER_LKM) && !defined(ACTUALLY_LKM_NOT_KERNEL)
> # define ACTUALLY_LKM_NOT_KERNEL
> # endif
> # endif
> # endif
> #endif /* __FreeBSD__ && KERNEL */
>
> #if defined(__FreeBSD_version) && (__FreeBSD_version >= 500000) && \
> defined(_KERNEL)
> # include <machine/in_cksum.h>
> #endif
>
233a253,259
> # define USE_INET6
> # endif
> # endif
> # if !defined(_KERNEL) && !defined(IPFILTER_LKM)
> # if (defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)) || \
> (defined(OpenBSD) && (OpenBSD >= 200111)) || \
> (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000))
344a371,373
> #ifndef TCPOPT_WSCALE
> # define TCPOPT_WSCALE 3
> #endif
346,379d374
< #if defined(__FreeBSD__) && (defined(KERNEL) || defined(_KERNEL))
< # ifdef IPFILTER_LKM
< # ifndef __FreeBSD_cc_version
< # include <osreldate.h>
< # else
< # if __FreeBSD_cc_version < 430000
< # include <osreldate.h>
< # else
< # include <sys/param.h>
< # endif
< # endif
< # define ACTUALLY_LKM_NOT_KERNEL
< # else
< # ifndef __FreeBSD_cc_version
< # include <sys/osreldate.h>
< # else
< # if __FreeBSD_cc_version < 430000
< # include <sys/osreldate.h>
< # else
< # include <sys/param.h>
< # endif
< # endif
< # endif
< # if __FreeBSD__ < 3
< # include <machine/spl.h>
< # else
< # if __FreeBSD__ == 3
< # if defined(IPFILTER_LKM) && !defined(ACTUALLY_LKM_NOT_KERNEL)
< # define ACTUALLY_LKM_NOT_KERNEL
< # endif
< # endif
< # endif
< #endif /* __FreeBSD__ && KERNEL */
<
584c579,580
< # if !defined(__FreeBSD__) || (defined (__FreeBSD__) && __FreeBSD__>=3)
---
> # if !defined(__FreeBSD__) || (defined (__FreeBSD_version) && \
> (__FreeBSD_version >= 300000))
593c589
< # else /* !__FreeBSD__ || (__FreeBSD__ && __FreeBSD__>=3) */
---
> # else /* !__FreeBSD__ || (__FreeBSD__ && __FreeBSD_version >= 300000) */
595c591
< # endif /* !__FreeBSD__ || (__FreeBSD__ && __FreeBSD__>=3) */
---
> # endif /* !__FreeBSD__ || (__FreeBSD__ && __FreeBSD_version >= 300000) */