From owner-svn-src-all@FreeBSD.ORG  Thu Nov 24 21:23:58 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E4DB5106564A;
	Thu, 24 Nov 2011 21:23:58 +0000 (UTC) (envelope-from rmh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D47FA8FC12;
	Thu, 24 Nov 2011 21:23:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAOLNwnw013297;
	Thu, 24 Nov 2011 21:23:58 GMT (envelope-from rmh@svn.freebsd.org)
Received: (from rmh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAOLNwVZ013294;
	Thu, 24 Nov 2011 21:23:58 GMT (envelope-from rmh@svn.freebsd.org)
Message-Id: <201111242123.pAOLNwVZ013294@svn.freebsd.org>
From: Robert Millan <rmh@FreeBSD.org>
Date: Thu, 24 Nov 2011 21:23:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r227957 - head/sys/contrib/ipfilter/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Nov 2011 21:23:59 -0000

Author: rmh
Date: Thu Nov 24 21:23:58 2011
New Revision: 227957
URL: http://svn.freebsd.org/changeset/base/227957

Log:
  Adjust a few old checks to use __FreeBSD_version macro to
  determine which version of FreeBSD kernel we're compiling.
  
  Approved by:	kib (mentor)

Modified:
  head/sys/contrib/ipfilter/netinet/ip_compat.h
  head/sys/contrib/ipfilter/netinet/ip_proxy.c

Modified: head/sys/contrib/ipfilter/netinet/ip_compat.h
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_compat.h	Thu Nov 24 20:54:06 2011	(r227956)
+++ head/sys/contrib/ipfilter/netinet/ip_compat.h	Thu Nov 24 21:23:58 2011	(r227957)
@@ -985,10 +985,10 @@ typedef	u_int32_t	u_32_t;
 typedef struct mbuf mb_t;
 # endif /* _KERNEL */
 
-# if __FreeBSD__ < 3
+# if __FreeBSD_version < 300000
 #  include <machine/spl.h>
 # else
-#  if __FreeBSD__ == 3
+#  if __FreeBSD_version < 400000
 #   if defined(IPFILTER_LKM) && !defined(ACTUALLY_LKM_NOT_KERNEL)
 #    define	ACTUALLY_LKM_NOT_KERNEL
 #   endif

Modified: head/sys/contrib/ipfilter/netinet/ip_proxy.c
==============================================================================
--- head/sys/contrib/ipfilter/netinet/ip_proxy.c	Thu Nov 24 20:54:06 2011	(r227956)
+++ head/sys/contrib/ipfilter/netinet/ip_proxy.c	Thu Nov 24 21:23:58 2011	(r227957)
@@ -63,7 +63,7 @@ struct file;
 # include <sys/stream.h>
 # include <sys/kmem.h>
 #endif
-#if __FreeBSD__ > 2
+#if __FreeBSD_version >= 300000
 # include <sys/queue.h>
 #endif
 #include <net/if.h>