Add #ifndef checks for macros

Add #ifndef checks for BPF_STMT and BPF_JUMP macros.

Bug: 26936282
Change-Id: I02a085bf8eccb5c3ba236b07c66b64afa02bb2a5

2 files changed, 5 insertions, 0 deletions

diff --git a/Android.mk b/Android.mk
index 0b916c02..3a68b882 100644
--- a/Android.mk
+++ b/Android.mk
@@ -3,6 +3,7 @@ LOCAL_PATH:= $(call my-dir)
 libpcap_cflags := \
   -Wno-unused-parameter \
   -D_U_="__attribute__((unused))" \
+  -Werror \
 
 include $(CLEAR_VARS)
 
diff --git a/pcap/bpf.h b/pcap/bpf.h
index 215d5ca0..66b7a274 100644
--- a/pcap/bpf.h
+++ b/pcap/bpf.h
@@ -1489,8 +1489,12 @@ struct bpf_aux_data {
 /*
  * 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);