socsvn commit: r271853 - soc2014/dpl/netmap-ipfwjit/sys/netpfil/ipfw

[dpl at FreeBSD.org]

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)();