diff options
author | Cy Schubert <cy@FreeBSD.org> | 2020-03-02 23:24:53 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2020-03-02 23:24:53 +0000 |
commit | 20746e11f7c0e86db0455163a006d046ee78d795 (patch) | |
tree | c007a09b41f039682f9c711e64d1651aa446b8c3 /sys/contrib | |
parent | fdf929ff91d432d17c4d7d0aa0f9995fffe6fa8e (diff) | |
download | src-20746e11f7c0e86db0455163a006d046ee78d795.tar.gz src-20746e11f7c0e86db0455163a006d046ee78d795.zip |
Continuing the effort started in r343701, #ifdef cleanup, checking for
__FreeBSD_version > 3.0 and 5.0 is redundant.
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=358558
Diffstat (limited to 'sys/contrib')
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_compat.h | 2 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_fil.h | 3 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_proxy.c | 2 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_state.c | 4 | ||||
-rw-r--r-- | sys/contrib/ipfilter/netinet/ip_sync.c | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 75f4d7c116ce..645ba314936a 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -126,7 +126,7 @@ * There may be other, safe, kernels but this is not extensively tested yet. */ # define HAVE_M_PULLDOWN -# if !defined(IPFILTER_LKM) && (__FreeBSD_version >= 300000) +# if !defined(IPFILTER_LKM) && defined(__FreeBSD_version) # include "opt_ipfilter.h" # endif # define COPYIN(a,b,c) copyin((caddr_t)(a), (caddr_t)(b), (c)) diff --git a/sys/contrib/ipfilter/netinet/ip_fil.h b/sys/contrib/ipfilter/netinet/ip_fil.h index 982bccb4c39b..7d70f5135da8 100644 --- a/sys/contrib/ipfilter/netinet/ip_fil.h +++ b/sys/contrib/ipfilter/netinet/ip_fil.h @@ -1420,8 +1420,7 @@ typedef struct ipftune { ** HPUX Port */ -#if !defined(CDEV_MAJOR) && defined (__FreeBSD_version) && \ - (__FreeBSD_version >= 220000) +#if !defined(CDEV_MAJOR) && defined (__FreeBSD_version) # define CDEV_MAJOR 79 #endif diff --git a/sys/contrib/ipfilter/netinet/ip_proxy.c b/sys/contrib/ipfilter/netinet/ip_proxy.c index 29ecdd4201a4..84d600ecd113 100644 --- a/sys/contrib/ipfilter/netinet/ip_proxy.c +++ b/sys/contrib/ipfilter/netinet/ip_proxy.c @@ -51,7 +51,7 @@ # include <sys/stream.h> # include <sys/kmem.h> #endif -#if __FreeBSD_version >= 300000 +#ifdef __FreeBSD_version # include <sys/queue.h> #endif #include <net/if.h> diff --git a/sys/contrib/ipfilter/netinet/ip_state.c b/sys/contrib/ipfilter/netinet/ip_state.c index f97dbd0a729b..d723d50f1659 100644 --- a/sys/contrib/ipfilter/netinet/ip_state.c +++ b/sys/contrib/ipfilter/netinet/ip_state.c @@ -82,7 +82,7 @@ #ifdef USE_INET6 #include <netinet/icmp6.h> #endif -#if FREEBSD_GE_REV(300000) +#ifdef __FreeBSD_version # include <sys/malloc.h> # if defined(_KERNEL) && !defined(IPFILTER_LKM) # include <sys/libkern.h> @@ -307,7 +307,7 @@ ipf_state_seed_alloc(u_int state_size, u_int state_max) /* * XXX - ipf_state_seed[X] should be a random number of sorts. */ -#if FREEBSD_GE_REV(400000) +#ifdef __FreeBSD_version state_seed[i] = arc4random(); #else state_seed[i] = ((u_long)state_seed + i) * state_size; diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/sys/contrib/ipfilter/netinet/ip_sync.c index 04018ed7b621..4cff54286cd3 100644 --- a/sys/contrib/ipfilter/netinet/ip_sync.c +++ b/sys/contrib/ipfilter/netinet/ip_sync.c @@ -30,7 +30,7 @@ # include <sys/mbuf.h> # endif # include <sys/select.h> -# if __FreeBSD_version >= 500000 +# ifdef __FreeBSD_version # include <sys/selinfo.h> # endif #endif |