d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retire macros:

Browse Source 
BSD_GE_YEAR
	BSD_GT_YEAR
	BSD_LT_YEAR

MFC after:	3 days
This commit is contained in:
Cy Schubert 2020-03-02 23:25:02 +00:00
parent 060abae563
commit 8b1e4b7c63
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/contrib/ipfilter/netinet/ip_compat.h
View File

@ -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

2
sys/contrib/ipfilter/netinet/ip_nat.c
View File

@ -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,

4
sys/contrib/ipfilter/netinet/ip_sync.c
View File

@ -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