Merge changes I02a085bf,Id5433d1d am: 9643d9ce73 am: de735023f2
am: c7958c10f7
* commit 'c7958c10f7c77bd2acd81bd3eb4997d5cd5a3047':
Add #ifndef checks for macros
Clean up version test
Change-Id: If4210b1941f5986b88313920399f99e5805d2cc9
diff --git a/Android.mk b/Android.mk
index 0b916c0..3a68b88 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,6 +3,7 @@
libpcap_cflags := \
-Wno-unused-parameter \
-D_U_="__attribute__((unused))" \
+ -Werror \
include $(CLEAR_VARS)
diff --git a/pcap-common.c b/pcap-common.c
index 4db4968..b6f0c97 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -1321,7 +1321,7 @@
return;
}
- if (!(nfhdr->nflog_version) == 0) {
+ if (nfhdr->nflog_version != 0) {
/* Unknown NFLOG version */
return;
}
diff --git a/pcap/bpf.h b/pcap/bpf.h
index 215d5ca..66b7a27 100644
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -1489,8 +1489,12 @@
/*
* Macros for insn array initializers.
*/
+#ifndef BPF_STMT
#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k }
+#endif
+#ifndef BPF_JUMP
#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k }
+#endif
#if __STDC__ || defined(__cplusplus)
extern int bpf_validate(const struct bpf_insn *, int);
