svn commit: r241546 - head/sys/contrib/ipfilter/netinet
Gleb Smirnoff
glebius at FreeBSD.org
Sun Oct 14 15:03:07 UTC 2012
Author: glebius
Date: Sun Oct 14 15:03:06 2012
New Revision: 241546
URL: http://svn.freebsd.org/changeset/base/241546
Log:
Fix defines in r241245. We actually don't define FreeBSD.
Reported & tested by: Oleg Ginzburg
Modified:
head/sys/contrib/ipfilter/netinet/fil.c
Modified: head/sys/contrib/ipfilter/netinet/fil.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/fil.c Sun Oct 14 14:45:54 2012 (r241545)
+++ head/sys/contrib/ipfilter/netinet/fil.c Sun Oct 14 15:03:06 2012 (r241546)
@@ -2513,7 +2513,7 @@ int out;
} else
#endif
{
-#if ((defined(OpenBSD) && (OpenBSD >= 200311)) || (defined(FreeBSD) && (__FreeBSD_version >= 1000019))) && defined(_KERNEL)
+#if ((defined(OpenBSD) && (OpenBSD >= 200311)) || (__FreeBSD_version >= 1000019)) && defined(_KERNEL)
ip->ip_len = ntohs(ip->ip_len);
ip->ip_off = ntohs(ip->ip_off);
#endif
@@ -2777,7 +2777,7 @@ finished:
RWLOCK_EXIT(&ipf_global);
#ifdef _KERNEL
-# if (defined(OpenBSD) && (OpenBSD >= 200311)) || (defined(FreeBSD) && (__FreeBSD_version >= 1000019))
+# if (defined(OpenBSD) && (OpenBSD >= 200311)) || (__FreeBSD_version >= 1000019)
if (FR_ISPASS(pass) && (v == 4)) {
ip = fin->fin_ip;
ip->ip_len = ntohs(ip->ip_len);
More information about the svn-src-head
mailing list