From: Rusty Russell <rusty@linuxcare.com.au>
Date: Mon, 4 Sep 2000 05:12:44 +0000 (+0000)
Subject: More sparc64 fixes.
X-Git-Tag: v1.2.1~104
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eede68159820640725c2f92dcc95cd97de1df743;p=thirdparty%2Fiptables.git

More sparc64 fixes.
---

diff --git a/Makefile b/Makefile
index 583db003..a292ca50 100644
--- 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 bc51ec72..f4c4ab70 100644
--- 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>