More sparc64 fixes.

diff --git a/Makefile b/Makefile
index 583db003896aac86bc18bc4c34115f41f0ae3bfd..a292ca501d157704bfa25cb10d6268418245d61b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(BINDIR)/ip6tables $(DES
 # Sparc64 hack
 ifeq ($(shell uname -m),sparc64)
 # The kernel is 64-bit, even though userspace is 32.
-CFLAGS+=-DIPT_MIN_MATCH_ALIGN=8 -DIPT_MIN_ENTRY_ALIGN=8
+CFLAGS+=-DIPT_MIN_MATCH_ALIGN=8 -DIPT_MIN_ENTRY_ALIGN=8 -DKERNEL_64_USERSPACE_32
 endif
 
 ifndef IPT_LIBDIR

diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h
index bc51ec72f34a48a987e3bbf1d72f678dbedfa3d1..f4c4ab7062dbbb600012140254c15d2a7498d957 100644 (file)
--- a/include/libipq/libipq.h
+++ b/include/libipq/libipq.h
@@ -26,7 +26,11 @@
 #include <asm/types.h>
 #include <linux/netlink.h>
 
+#ifdef KERNEL_64_USERSPACE_32
+#include "ip_queue_64.h"
+#else
 #include <linux/netfilter_ipv4/ip_queue.h>
+#endif
 
 #ifdef DEBUG_LIBIPQ
 #include <stdio.h>