Merge pull request #580 from wigyori/cc-libpcap
[15.05/openwrt.git] / package / libs / libpcap / patches / 001-Fix-compiler_state_t.ai-usage-when-INET6-is-not-defi.patch
1 From 64aa033a061c43fc15c711f2490ae41d23b868c3 Mon Sep 17 00:00:00 2001
2 From: Fabio Berton <fabio.berton@ossystems.com.br>
3 Date: Thu, 17 Nov 2016 09:44:42 -0200
4 Subject: [PATCH 1/2] Fix compiler_state_t.ai usage when INET6 is not defined
5 Organization: O.S. Systems Software LTDA.
6
7 Fix error:
8
9 /
10 | ../libpcap-1.8.1/gencode.c: In function 'pcap_compile':
11 | ../libpcap-1.8.1/gencode.c:693:8: error: 'compiler_state_t
12 | {aka struct _compiler_state}' has no member named 'ai'
13 |   cstate.ai = NULL;
14 \
15
16 Upstream-Status: Submitted [1]
17
18 [1] https://github.com/the-tcpdump-group/libpcap/pull/541
19
20 Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
21 ---
22  gencode.c | 2 ++
23  1 file changed, 2 insertions(+)
24
25 diff --git a/gencode.c b/gencode.c
26 index a887f27..e103c70 100644
27 --- a/gencode.c
28 +++ b/gencode.c
29 @@ -690,7 +690,9 @@ pcap_compile(pcap_t *p, struct bpf_program *program,
30         }
31         initchunks(&cstate);
32         cstate.no_optimize = 0;
33 +#ifdef INET6
34         cstate.ai = NULL;
35 +#endif
36         cstate.ic.root = NULL;
37         cstate.ic.cur_mark = 0;
38         cstate.bpf_pcap = p;
39 -- 
40 2.1.4
41