From: Guy Harris Date: Sat, 1 Sep 2018 01:17:35 +0000 (-0700) Subject: Squelch a compiler warning. X-Git-Tag: libpcap-1.10-bp~861 X-Git-Url: https://git.tcpdump.org/libpcap/commitdiff_plain/f21caab7dfb4d6f0e76db7ad078fe85f68481a9a Squelch a compiler warning. --- diff --git a/bpf_filter.c b/bpf_filter.c index af19158d..ebf118f4 100644 --- a/bpf_filter.c +++ b/bpf_filter.c @@ -44,6 +44,7 @@ #include #include "pcap-types.h" +#include "varattrs.h" #include "extract.h" #define EXTRACT_SHORT EXTRACT_BE_U_2 @@ -83,9 +84,15 @@ enum { * * Thanks to Ani Sinha for providing initial implementation */ +#if defined(SKF_AD_VLAN_TAG_PRESENT) u_int bpf_filter_with_aux_data(const struct bpf_insn *pc, const u_char *p, u_int wirelen, u_int buflen, const struct bpf_aux_data *aux_data) +#else +u_int +bpf_filter_with_aux_data(const struct bpf_insn *pc, const u_char *p, + u_int wirelen, u_int buflen, const struct bpf_aux_data *aux_data _U_) +#endif { register uint32_t A, X; register bpf_u_int32 k; @@ -370,7 +377,6 @@ bpf_filter(const struct bpf_insn *pc, const u_char *p, u_int wirelen, return bpf_filter_with_aux_data(pc, p, wirelen, buflen, NULL); } - /* * Return true if the 'fcode' is a valid filter program. * The constraints are that each jump be forward and to a valid