svn commit: r358666 - in stable: 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Thu Mar  5 06:38:03 2020
New Revision: 358666
URL: https://svnweb.freebsd.org/changeset/base/358666

Log:
  MFC r358560:
  
  Retire macros:
  
  	BSD_GE_YEAR
  	BSD_GT_YEAR
  	BSD_LT_YEAR

Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_compat.h
  stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
  stable/11/sys/contrib/ipfilter/netinet/ip_sync.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sys/contrib/ipfilter/netinet/ip_compat.h
  stable/12/sys/contrib/ipfilter/netinet/ip_nat.c
  stable/12/sys/contrib/ipfilter/netinet/ip_sync.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/ip_compat.h	Thu Mar  5 06:36:23 2020	(r358665)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_compat.h	Thu Mar  5 06:38:03 2020	(r358666)
@@ -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)))
 
 
 /* ----------------------------------------------------------------------- */
@@ -438,7 +435,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
@@ -732,7 +729,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
 

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_nat.c
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/ip_nat.c	Thu Mar  5 06:36:23 2020	(r358665)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_nat.c	Thu Mar  5 06:38:03 2020	(r358666)
@@ -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,

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_sync.c
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/ip_sync.c	Thu Mar  5 06:36:23 2020	(r358665)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_sync.c	Thu Mar  5 06:38:03 2020	(r358666)
@@ -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