svn commit: r316125 - head/contrib/libpcap

[Xin LI]

Author: delphij
Date: Wed Mar 29 03:36:26 2017
New Revision: 316125
URL: https://svnweb.freebsd.org/changeset/base/316125

Log:
  MFV r316124: Fix build when WITHOUT_INET6.
  
  Reported by:	Randy Westlund <rwestlun gmail com>
  MFC after:	3 days

Modified:
  head/contrib/libpcap/gencode.c
Directory Properties:
  head/contrib/libpcap/   (props changed)

Modified: head/contrib/libpcap/gencode.c
==============================================================================
--- head/contrib/libpcap/gencode.c	Wed Mar 29 03:28:09 2017	(r316124)
+++ head/contrib/libpcap/gencode.c	Wed Mar 29 03:36:26 2017	(r316125)
@@ -525,7 +525,8 @@ static struct block *gen_host6(compiler_
     struct in6_addr *, int, int, int);
 #endif
 #ifndef INET6
-static struct block *gen_gateway(const u_char *, bpf_u_int32 **, int, int);
+static struct block *gen_gateway(compiler_state_t *, const u_char *,
+    bpf_u_int32 **, int, int);
 #endif
 static struct block *gen_ipfrag(compiler_state_t *);
 static struct block *gen_portatom(compiler_state_t *, int, bpf_int32);
@@ -692,7 +693,9 @@ pcap_compile(pcap_t *p, struct bpf_progr
 	}
 	initchunks(&cstate);
 	cstate.no_optimize = 0;
+#ifdef INET6
 	cstate.ai = NULL;
+#endif
 	cstate.ic.root = NULL;
 	cstate.ic.cur_mark = 0;
 	cstate.bpf_pcap = p;
@@ -4904,11 +4907,8 @@ gen_host6(compiler_state_t *cstate, stru
 
 #ifndef INET6
 static struct block *
-gen_gateway(eaddr, alist, proto, dir)
-	const u_char *eaddr;
-	bpf_u_int32 **alist;
-	int proto;
-	int dir;
+gen_gateway(compiler_state_t *cstate, const u_char *eaddr, bpf_u_int32 **alist,
+    int proto, int dir)
 {
 	struct block *b0, *b1, *tmp;
 
@@ -6472,7 +6472,7 @@ gen_scode(compiler_state_t *cstate, cons
 		alist = pcap_nametoaddr(name);
 		if (alist == NULL || *alist == NULL)
 			bpf_error(cstate, "unknown host '%s'", name);
-		b = gen_gateway(eaddr, alist, proto, dir);
+		b = gen_gateway(cstate, eaddr, alist, proto, dir);
 		free(eaddr);
 		return b;
 #else