diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2020-03-02 23:25:02 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2020-03-02 23:25:02 +0000 |
| commit | 8b1e4b7c634589ecff20359710ed43e745d2f1d4 (patch) | |
| tree | 4603273d43a532cc6bd7bdadadc7683e9313b8d9 /sys/contrib | |
| parent | 060abae56375580f3fb7ead2ebd63e74c4843584 (diff) | |
| download | src-8b1e4b7c634589ecff20359710ed43e745d2f1d4.tar.gz src-8b1e4b7c634589ecff20359710ed43e745d2f1d4.zip | |
Retire macros:
BSD_GE_YEAR
BSD_GT_YEAR
BSD_LT_YEAR
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=358560
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_compat.h | 7 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_nat.c | 2 | ||||
| -rw-r--r-- | sys/contrib/ipfilter/netinet/ip_sync.c | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h index 53dce2e79d71..29590298d79f 100644 --- a/sys/contrib/ipfilter/netinet/ip_compat.h +++ b/sys/contrib/ipfilter/netinet/ip_compat.h @@ -89,9 +89,6 @@ (__NetBSD_Version__ > (x))) #define NETBSD_LT_REV(x) (defined(__NetBSD_Version__) && \ (__NetBSD_Version__ < (x))) -#define BSD_GE_YEAR(x) (defined(BSD) && (BSD >= (x))) -#define BSD_GT_YEAR(x) (defined(BSD) && (BSD > (x))) -#define BSD_LT_YEAR(x) (defined(BSD) && (BSD < (x))) /* ----------------------------------------------------------------------- */ @@ -439,7 +436,7 @@ extern mb_t *allocmbt(size_t); * On BSD's use quad_t as a guarantee for getting at least a 64bit sized * object. */ -#if !defined(__amd64__) && BSD_GT_YEAR(199306) +#if !defined(__amd64__) && !SOLARIS # define USE_QUAD_T # define U_QUAD_T unsigned long long # define QUAD_T long long @@ -733,7 +730,7 @@ typedef struct tcpiphdr tcpiphdr_t; #define TCPF_ALL (TH_FIN|TH_SYN|TH_RST|TH_PUSH|TH_ACK|TH_URG|\ TH_ECN|TH_CWR) -#if BSD_GE_YEAR(199306) && !defined(m_act) +#if !SOLARIS && !defined(m_act) # define m_act m_nextpkt #endif diff --git a/sys/contrib/ipfilter/netinet/ip_nat.c b/sys/contrib/ipfilter/netinet/ip_nat.c index e57ef8c9a97a..e80eb5679373 100644 --- a/sys/contrib/ipfilter/netinet/ip_nat.c +++ b/sys/contrib/ipfilter/netinet/ip_nat.c @@ -1010,7 +1010,7 @@ ipf_nat_ioctl(softc, data, cmd, mode, uid, ctx) ipnat_t natd; SPL_INT(s); -#if BSD_GE_YEAR(199306) && defined(_KERNEL) +#if !SOLARIS && defined(_KERNEL) # if NETBSD_GE_REV(399002000) if ((mode & FWRITE) && kauth_authorize_network(curlwp->l_cred, KAUTH_NETWORK_FIREWALL, diff --git a/sys/contrib/ipfilter/netinet/ip_sync.c b/sys/contrib/ipfilter/netinet/ip_sync.c index 4cff54286cd3..95c383c08d8f 100644 --- a/sys/contrib/ipfilter/netinet/ip_sync.c +++ b/sys/contrib/ipfilter/netinet/ip_sync.c @@ -437,7 +437,7 @@ ipf_sync_write(softc, uio) int err = 0; -# if BSD_GE_YEAR(199306) || defined(__FreeBSD__) +# if defined(__NetBSD__) || defined(__FreeBSD__) uio->uio_rw = UIO_WRITE; # endif @@ -585,7 +585,7 @@ ipf_sync_read(softc, uio) return EINVAL; } -# if BSD_GE_YEAR(199306) || defined(__FreeBSD__) +# if defined(__NetBSD__) || defined(__FreeBSD__) uio->uio_rw = UIO_READ; # endif |