aboutsummaryrefslogtreecommitdiffstats
path: root/sys/contrib/ipfilter/netinet/ip_compat.h
diff options
context:
space:
mode:
authorDarren Reed <darrenr@FreeBSD.org>2002-04-27 16:52:49 +0000
committerDarren Reed <darrenr@FreeBSD.org>2002-04-27 16:52:49 +0000
commit635ff71d68c21b0cc5df26ad8a0eeb3a73f0f96b (patch)
tree012c8006390a2fc3f7f147cd5b625f66bdf27ff2 /sys/contrib/ipfilter/netinet/ip_compat.h
parent43ba65e60d8d4967956752a79619c4e7950a846a (diff)
downloadsrc-635ff71d68c21b0cc5df26ad8a0eeb3a73f0f96b.tar.gz
src-635ff71d68c21b0cc5df26ad8a0eeb3a73f0f96b.zip
Import version 3.4.27
Notes
Notes: svn path=/vendor-sys/ipfilter/dist/; revision=95561
Diffstat (limited to 'sys/contrib/ipfilter/netinet/ip_compat.h')
-rw-r--r--sys/contrib/ipfilter/netinet/ip_compat.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index d0dc859aae47..3b1b9807b561 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -4,7 +4,7 @@
* See the IPFILTER.LICENCE file for details on licencing.
*
* @(#)ip_compat.h 1.8 1/14/96
- * $Id: ip_compat.h,v 2.26.2.43 2002/04/23 16:08:50 darrenr Exp $
+ * $Id: ip_compat.h,v 2.26.2.44 2002/04/25 16:32:15 darrenr Exp $
*/
#ifndef __IP_COMPAT_H__
@@ -252,7 +252,7 @@ typedef u_int32_t u_32_t;
# define USE_INET6
# endif
# endif
-# if !defined(_KERNEL) && !defined(IPFILTER_LKM)
+# if !defined(_KERNEL) && !defined(IPFILTER_LKM) && !defined(USE_INET6)
# if (defined(__FreeBSD_version) && (__FreeBSD_version >= 400000)) || \
(defined(OpenBSD) && (OpenBSD >= 200111)) || \
(defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 105000000))
@@ -572,7 +572,8 @@ extern void m_copyback __P((struct mbuf *, int, int, caddr_t));
# endif
# if (BSD >= 199306) || defined(__FreeBSD__)
# if (defined(__NetBSD_Version__) && (__NetBSD_Version__ < 105180000)) || \
- defined(__FreeBSD__) || defined(__OpenBSD__) || defined(_BSDI_VERSION)
+ defined(__FreeBSD__) || (defined(OpenBSD) && (OpenBSD < 200206)) || \
+ defined(_BSDI_VERSION)
# include <vm/vm.h>
# endif
# if !defined(__FreeBSD__) || (defined (__FreeBSD_version) && \