From owner-svn-src-projects@FreeBSD.ORG  Tue Jan 22 06:20:43 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BE88BAE7;
 Tue, 22 Jan 2013 06:20:43 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9A05777B;
 Tue, 22 Jan 2013 06:20:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0M6KhAQ036476;
 Tue, 22 Jan 2013 06:20:43 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0M6KhQL036475;
 Tue, 22 Jan 2013 06:20:43 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201301220620.r0M6KhQL036475@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 22 Jan 2013 06:20:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245769 - projects/counters/sys/contrib/ipfilter/netinet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Jan 2013 06:20:43 -0000

Author: glebius
Date: Tue Jan 22 06:20:43 2013
New Revision: 245769
URL: http://svnweb.freebsd.org/changeset/base/245769

Log:
  Forcibly defining _KERNEL is bad idea. Toss some code so that ip_var.h
  isn't included with forced _KERNEL define.

Modified:
  projects/counters/sys/contrib/ipfilter/netinet/ip_auth.c

Modified: projects/counters/sys/contrib/ipfilter/netinet/ip_auth.c
==============================================================================
--- projects/counters/sys/contrib/ipfilter/netinet/ip_auth.c	Tue Jan 22 05:41:34 2013	(r245768)
+++ projects/counters/sys/contrib/ipfilter/netinet/ip_auth.c	Tue Jan 22 06:20:43 2013	(r245769)
@@ -70,14 +70,14 @@ struct file;
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#if !defined(linux)
+# include <netinet/ip_var.h>
+#endif
 #if !defined(_KERNEL) && !defined(__osf__) && !defined(__sgi)
 # define	KERNEL
 # define	_KERNEL
 # define	NOT_KERNEL
 #endif
-#if !defined(linux)
-# include <netinet/ip_var.h>
-#endif
 #ifdef	NOT_KERNEL
 # undef	_KERNEL
 # undef	KERNEL