aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/ipfilter/netinet/ip_pool.c
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2019-02-03 05:25:49 +0000
committerCy Schubert <cy@FreeBSD.org>2019-02-03 05:25:49 +0000
commit0fcd8cab4e32a4899dc1c4a440ad29ba308e656d (patch)
tree9bf580f722f4a2cc2b1635c42c634c9c83c52e82 /sys/contrib/ipfilter/netinet/ip_pool.c
parentb90dad3524185ae3e0d696da3509c31e4d9b5a93 (diff)
downloadsrc-0fcd8cab4e32a4899dc1c4a440ad29ba308e656d.tar.gz
src-0fcd8cab4e32a4899dc1c4a440ad29ba308e656d.zip
ipfilter #ifdef cleanup.
Remove #ifdefs for ancient and irrelevant operating systems from ipfilter. When ipfilter was written the UNIX and UNIX-like systems in use were diverse and plentiful. IRIX, Tru64 (OSF/1) don't exist any more. OpenBSD removed ipfilter shortly after the first time the ipfilter license terms changed in the early 2000's. ipfilter on AIX, HP/UX, and Linux never really caught on. Removal of code for operating systems that ipfilter will never run on again will simplify the code making it easier to fix bugs, complete partially implemented features, and extend ipfilter. Unsupported previous version FreeBSD code and some older NetBSD code has also been removed. What remains is supported FreeBSD, NetBSD, and illumos. FreeBSD and NetBSD have collaborated exchanging patches, while illumos has expressed willingness to have their ipfilter updated to 5.1.2, provided their zone-specific updates to their ipfilter are merged (which are of interest to FreeBSD to allow control of ipfilters in jails from the global zone). Reviewed by: glebius@ MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D19006
Notes
Notes: svn path=/head/; revision=343701
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_pool.c')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_pool.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_pool.c b/sys/contrib/ipfilter/netinet/ip_pool.c
index 2a43cdb00bfa..fd511fcd2d89 100644
--- a/sys/contrib/ipfilter/netinet/ip_pool.c
+++ b/sys/contrib/ipfilter/netinet/ip_pool.c
@@ -9,9 +9,6 @@
# define KERNEL 1
# define _KERNEL 1
#endif
-#if defined(__osf__)
-# define _PROTO_NET_H_
-#endif
#include <sys/errno.h>
#include <sys/types.h>
#include <sys/param.h>
@@ -21,9 +18,6 @@
# include <stdlib.h>
# include <string.h>
# define _KERNEL
-# ifdef __OpenBSD__
-struct file;
-# endif
# include <sys/uio.h>
# undef _KERNEL
#else
@@ -36,7 +30,7 @@ struct file;
#if defined(_KERNEL) && !defined(SOLARIS2)
# include <sys/mbuf.h>
#endif
-#if defined(__SVR4) || defined(__svr4__)
+#if defined(__SVR4)
# include <sys/byteorder.h>
# ifdef _KERNEL
# include <sys/dditypes.h>
@@ -44,7 +38,7 @@ struct file;
# include <sys/stream.h>
# include <sys/kmem.h>
#endif
-#if defined(__FreeBSD_version) && (__FreeBSD_version >= 300000)
+#if defined(__FreeBSD_version)
# include <sys/malloc.h>
#endif