summaryrefslogtreecommitdiff
path: root/bpf
diff options
context:
space:
mode:
authorguy <guy>2003-02-23 00:22:00 +0000
committerguy <guy>2003-02-23 00:22:00 +0000
commit463507912dacd2ed1104e4c9867bfb6b34033719 (patch)
treec5826635d9d477681bca960a8055497a459435f4 /bpf
parent0e96f354cab5b75695f8ac656e5d736cf2b5b30f (diff)
downloadlibpcap-463507912dacd2ed1104e4c9867bfb6b34033719.tar.gz
Include "config.h", so that LBL_ALIGN is defined as appropriate, and add
"__arm__" to the list of #defines we check for if LBL_ALIGN isn't defined, so that on ARM we assume unaligned accesses are unsafe (which they are, on at least some ARM processors).
Diffstat (limited to 'bpf')
-rw-r--r--bpf/net/bpf_filter.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/bpf/net/bpf_filter.c b/bpf/net/bpf_filter.c
index 2de7e528..76b7a385 100644
--- a/bpf/net/bpf_filter.c
+++ b/bpf/net/bpf_filter.c
@@ -40,7 +40,11 @@
#if !(defined(lint) || defined(KERNEL) || defined(_KERNEL))
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.41 2003-02-11 01:46:07 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/bpf/net/bpf_filter.c,v 1.42 2003-02-23 00:22:00 guy Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
#endif
#ifdef WIN32
@@ -77,8 +81,13 @@ static const char rcsid[] =
#define u_int32 bpf_u_int32
#ifndef LBL_ALIGN
+/*
+ * XXX - IA-64? If not, this probably won't work on Win64 IA-64
+ * systems, unless LBL_ALIGN is defined elsewhere for them.
+ */
#if defined(sparc) || defined(__sparc__) || defined(mips) || \
- defined(ibm032) || defined(__alpha) || defined(__hpux)
+ defined(ibm032) || defined(__alpha) || defined(__hpux) || \
+ defined(__arm__)
#define LBL_ALIGN
#endif
#endif