summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrusty <rusty>2000-09-04 05:12:44 +0000
committerrusty <rusty>2000-09-04 05:12:44 +0000
commita1452c533af669c9efb6a0738baaf42adac587ea (patch)
treef9d207f82b1508b16aed8e4c9e9d280151e961e3
parent81b64a2a578930b5eeb655cc975cd4c448b4d8f2 (diff)
More sparc64 fixes.
-rw-r--r--Makefile2
-rw-r--r--include/libipq/libipq.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 583db00..a292ca5 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 bc51ec7..f4c4ab7 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>