svn commit: r348600 - stable/12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Tue Jun  4 03:04:30 2019
New Revision: 348600
URL: https://svnweb.freebsd.org/changeset/base/348600

Log:
  MFC r348320:
  
  Contuation of r343701, removal of irrelevant #ifdefs.

Modified:
  stable/12/sys/contrib/ipfilter/netinet/ip_frag.c
  stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h
  stable/12/sys/contrib/ipfilter/netinet/ip_rules.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/contrib/ipfilter/netinet/ip_frag.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/ip_frag.c	Tue Jun  4 02:37:11 2019	(r348599)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_frag.c	Tue Jun  4 03:04:30 2019	(r348600)
@@ -34,11 +34,11 @@
 #include <sys/socket.h>
 #if defined(_KERNEL)
 # include <sys/systm.h>
-# if !defined(__SVR4) && !defined(__svr4__)
+# if !defined(__SVR4)
 #  include <sys/mbuf.h>
 # endif
 #endif
-#if !defined(__SVR4) && !defined(__svr4__)
+#if !defined(__SVR4)
 # if defined(_KERNEL)
 #  include <sys/kernel.h>
 # endif

Modified: stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h	Tue Jun  4 02:37:11 2019	(r348599)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_proxy.h	Tue Jun  4 03:04:30 2019	(r348600)
@@ -13,14 +13,14 @@
 #define	__IP_PROXY_H__
 
 #ifndef	SOLARIS
-# if defined(sun) && (defined(__svr4__) || defined(__SVR4))
+# if defined(sun) && defined(__SVR4))
 #  define	SOLARIS		1
 # else
 #  define	SOLARIS		0
 # endif
 #endif
 
-#if defined(__STDC__) || defined(__GNUC__) || defined(_AIX51)
+#if defined(__STDC__) || defined(__GNUC__)
 #define	SIOCPROXY	_IOWR('r', 64, struct ap_control)
 #else
 #define	SIOCPROXY	_IOWR(r, 64, struct ap_control)

Modified: stable/12/sys/contrib/ipfilter/netinet/ip_rules.c
==============================================================================
--- stable/12/sys/contrib/ipfilter/netinet/ip_rules.c	Tue Jun  4 02:37:11 2019	(r348599)
+++ stable/12/sys/contrib/ipfilter/netinet/ip_rules.c	Tue Jun  4 03:04:30 2019	(r348600)
@@ -12,22 +12,18 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 40000)
+#if defined(__FreeBSD_version)
 # if defined(_KERNEL)
 #  include <sys/libkern.h>
 # else
 #  include <sys/unistd.h>
 # endif
-#endif
-#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 399000000)
 #else
-# if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__sgi)
-#  include <sys/systm.h>
-# endif
+# include <sys/systm.h>
 #endif
 #include <sys/errno.h>
 #include <sys/param.h>
-#if !defined(__SVR4) && !defined(__svr4__) && !defined(__hpux)
+#if !defined(__SVR4)
 # include <sys/mbuf.h>
 #endif
 #if defined(__FreeBSD__)