summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorcy <cy@FreeBSD.org>2013-09-21 03:57:56 +0000
committercy <cy@FreeBSD.org>2013-09-21 03:57:56 +0000
commitf85536e875960caa433c4e51cf2b4358851facdd (patch)
treeabab8bdfd358742e019dea710908ec945ea42193 /sys/contrib
parent82601b02ea0b96db084c04758abf7f43d57a7098 (diff)
downloadFreeBSD-src-f85536e875960caa433c4e51cf2b4358851facdd.zip
FreeBSD-src-f85536e875960caa433c4e51cf2b4358851facdd.tar.gz
Remove additional non-FreeBSD code.
Approved by: glebius (mentor) Approved by: re (blanket)
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_compat.h27
1 files changed, 2 insertions, 25 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index 6cce591..1d5b5b7 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -37,24 +37,6 @@
!defined(_KERNEL) && !defined(USE_INET6) && !defined(NOINET6)
# define USE_INET6
#endif
-#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000) && \
- !defined(_KERNEL) && !defined(USE_INET6)
-# define USE_INET6
-#endif
-#if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 106140000) && \
- defined(_KERNEL) && \
- (!defined(IPFILTER_LKM) || (__NetBSD_Version__ >= 399000100))
-# define IPFILTER_M_IPFILTER
-#endif
-#if !defined(USE_INET6)
-# if defined(OpenBSD) && (OpenBSD >= 200206) && \
- !defined(_KERNEL) && !defined(USE_INET6)
-# define USE_INET6
-# endif
-# if defined(HPUXREV) && (HPUXREV >= 1111)
-# define USE_INET6
-# endif
-#endif
#if defined(__SVR4) || defined(__svr4__) || defined(__sgi)
@@ -546,13 +528,8 @@ MALLOC_DECLARE(M_IPFILTER);
# define GETIFMTU_6(x) ((struct ifnet *)x)->if_mtu
# if !defined(USE_MUTEXES) && !defined(SPL_NET)
-# if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199407)) || \
- OPENBSD_GE_REV(200006)
-# define SPL_NET(x) x = splsoftnet()
-# else
-# define SPL_IMP(x) x = splimp()
-# define SPL_NET(x) x = splnet()
-# endif /* NetBSD && (NetBSD <= 1991011) && (NetBSD >= 199407) */
+# define SPL_IMP(x) x = splimp()
+# define SPL_NET(x) x = splnet()
# if !defined(SPL_SCHED)
# define SPL_SCHED(x) x = splsched()
# endif
OpenPOWER on IntegriCloud