Fixed merge issues.

[stg.git] / projects / stargazer / plugins / capture / ipq_linux / libipq.h

diff --git a/projects/stargazer/plugins/capture/ipq_linux/libipq.h b/projects/stargazer/plugins/capture/ipq_linux/libipq.h
index c55a4e52f1446de598802fedb7de884aecf7ffdc..58a715876b2964ca73975243b67d004cf7f986f3 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/libipq.h
+++ b/projects/stargazer/plugins/capture/ipq_linux/libipq.h
@@ -31,12 +31,10 @@
 #include <asm/types.h>
 #include <linux/netlink.h>
 
 #include <asm/types.h>
 #include <linux/netlink.h>
 

+#include <linux/netfilter_ipv4/ip_queue.h>

 #ifdef KERNEL_64_USERSPACE_32
 #ifdef KERNEL_64_USERSPACE_32

-#include "ip_queue_64.h"

 typedef u_int64_t ipq_id_t;
 #else
 typedef u_int64_t ipq_id_t;
 #else

-#include <linux/netfilter_ipv4/ip_queue.h>
-#endif

 typedef unsigned long ipq_id_t;
 #endif
 
 typedef unsigned long ipq_id_t;
 #endif