From owner-svn-soc-all@FreeBSD.ORG  Mon Aug  4 14:11:23 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6E013480
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 14:11:23 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 425CF249D
 for <svn-soc-all@FreeBSD.org>; Mon,  4 Aug 2014 14:11:23 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.9/8.14.9) with ESMTP id s74EBNJF054088
 for <svn-soc-all@FreeBSD.org>; Mon, 4 Aug 2014 14:11:23 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.9/8.14.9/Submit) id s74EBMf7053969
 for svn-soc-all@FreeBSD.org; Mon, 4 Aug 2014 14:11:22 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Mon, 4 Aug 2014 14:11:22 GMT
Message-Id: <201408041411.s74EBMf7053969@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r271853 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Aug 2014 14:11:23 -0000

Author: dpl
Date: Mon Aug  4 14:11:22 2014
New Revision: 271853
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=271853

Log:
  Corrected some issues with our defines and inclusion of code.

Modified:
  soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc

Modified: soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc
==============================================================================
--- soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc	Mon Aug  4 14:08:23 2014	(r271852)
+++ soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw/jit.cc	Mon Aug  4 14:11:22 2014	(r271853)
@@ -1,43 +1,32 @@
 /* JIT compilation code */
+#undef _KERNEL
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include <llvm/ADT/OwningPtr.h>
+#include <llvm/Bitcode/ReaderWriter.h>
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Module.h>
+#include <llvm/Support/MemoryBuffer.h>
+#include <llvm/Support/ErrorOr.h>
+#define _KERNEL
+
 extern "C" {
 #include <glue.h>
 #include <missing.h>
-#include <sys/types.h>
-#include <stdint.h>
-#include <time.h>
-#include <sys/socket.h>
-#include <sys/queue.h>
-#include <sys/lock.h>
-#include <sys/param.h>
-#include <sys/mutex.h>
-#include <netinet/in.h>
-#include <net/if.h>
+
+#include <sys/mbuf.h>
 #include <netinet/ip_fw.h>
 #include <netinet/ip_dummynet.h>
-#include <net/netmap_user.h>
-#include <net/if_var.h>
-#include <net/ethernet.h>
 #include <netinet/in_pcb.h>
-#include <netinet/ip_var.h>
-#include <sys/lock.h>
-#include <sys/param.h>
 
 #include <netpfil/ipfw/dn_heap.h>
 #include <netpfil/ipfw/ip_dn_private.h>
 #include <netpfil/ipfw/ip_fw_private.h>
 }
 
-#include <iostream>
-#include <string>
-#include <vector>
-
-#include <llvm/ADT/OwningPtr.h>
-#include <llvm/Bitcode/ReaderWriter.h>
-#include <llvm/IR/IRBuilder.h>
-#include <llvm/IR/LLVMContext.h>
-#include <llvm/IR/Module.h>
-#include <llvm/Support/MemoryBuffer.h>
-#include <llvm/Support/ErrorOr.h>
 
 typedef int (*funcptr)();