From owner-svn-src-projects@FreeBSD.ORG  Thu Dec  6 00:06:15 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CE3D6D24;
 Thu,  6 Dec 2012 00:06:15 +0000 (UTC)
 (envelope-from jkim@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 B2BBE8FC0C;
 Thu,  6 Dec 2012 00:06:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB606FfZ015175;
 Thu, 6 Dec 2012 00:06:15 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB606Flk015174;
 Thu, 6 Dec 2012 00:06:15 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201212060006.qB606Flk015174@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 6 Dec 2012 00:06:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r243920 - projects/bpfjit/sys/net
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: Thu, 06 Dec 2012 00:06:15 -0000

Author: jkim
Date: Thu Dec  6 00:06:15 2012
New Revision: 243920
URL: http://svnweb.freebsd.org/changeset/base/243920

Log:
  Slightly reduce diff against the original NetBSD version.

Modified:
  projects/bpfjit/sys/net/bpfjit.h

Modified: projects/bpfjit/sys/net/bpfjit.h
==============================================================================
--- projects/bpfjit/sys/net/bpfjit.h	Wed Dec  5 23:51:28 2012	(r243919)
+++ projects/bpfjit/sys/net/bpfjit.h	Thu Dec  6 00:06:15 2012	(r243920)
@@ -34,16 +34,22 @@
 #ifndef _NET_BPFJIT_H_
 #define _NET_BPFJIT_H_
 
-#ifdef _KERNEL
-#include <sys/types.h>
-
-extern int bpfjit_disable;
-#else
+#ifndef _KERNEL
 #include <stddef.h>
 #include <stdint.h>
 #endif
 
+#include <sys/types.h>
+
+#ifdef __linux
+#include <pcap-bpf.h>
+#else
 #include <net/bpf.h>
+#endif
+
+#ifdef _KERNEL
+extern int bpfjit_disable;
+#endif
 
 /*
  * RETURN value and arguments of a function generated by sljit have sljit_uw