diff options
| author | rmh <rmh@FreeBSD.org> | 2011-11-24 21:23:58 +0000 |
|---|---|---|
| committer | rmh <rmh@FreeBSD.org> | 2011-11-24 21:23:58 +0000 |
| commit | 922d7543f7d79dff8fcffe073fcfb16ada8b7cdc (patch) | |
| tree | 877b8cbcc2c239f1dc0038fb5319ef10f265b70d | |
| parent | ded9c6c8464d184f0fd51877af4a60b0bcc8856a (diff) | |
| download | FreeBSD-src-922d7543f7d79dff8fcffe073fcfb16ada8b7cdc.zip FreeBSD-src-922d7543f7d79dff8fcffe073fcfb16ada8b7cdc.tar.gz | |
Adjust a few old checks to use __FreeBSD_version macro to
determine which version of FreeBSD kernel we're compiling.
Approved by: kib (mentor)
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_compat.h | 4 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_proxy.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 35c9f68..4305c48 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -985,10 +985,10 @@ typedef u_int32_t u_32_t; typedef struct mbuf mb_t; # endif /* _KERNEL */ -# if __FreeBSD__ < 3 +# if __FreeBSD_version < 300000 # include <machine/spl.h> # else -# if __FreeBSD__ == 3 +# if __FreeBSD_version < 400000 # if defined(IPFILTER_LKM) && !defined(ACTUALLY_LKM_NOT_KERNEL) # define ACTUALLY_LKM_NOT_KERNEL # endif diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c index b0490a1..e492a33 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.c +++ b/sys/contrib/ipfilter/netinet/ip_proxy.c @@ -63,7 +63,7 @@ struct file; # include <sys/stream.h> # include <sys/kmem.h> #endif -#if __FreeBSD__ > 2 +#if __FreeBSD_version >= 300000 # include <sys/queue.h> #endif #include <net/if.h> |
