diff options
| author | Xin LI <delphij@FreeBSD.org> | 2015-01-24 06:06:46 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2015-01-24 06:06:46 +0000 |
| commit | 2fae2ab4c7a265561f9c2e9b22cb44e98db7cd4f (patch) | |
| tree | a578aa1105dc4906ee36099b03e9ea6a7ca4f5ca /contrib/tcpdump | |
| parent | 7cf3e8e4c353e86d04df84d38b6489b048a6cd2c (diff) | |
| download | src-test-2fae2ab4c7a265561f9c2e9b22cb44e98db7cd4f.tar.gz src-test-2fae2ab4c7a265561f9c2e9b22cb44e98db7cd4f.zip | |
Don't include libcapsicum headers when requested.
Reported by: luigi
MFC after: 14 days
X-MFC-with: r276788
Notes
Notes:
svn path=/head/; revision=277638
Diffstat (limited to 'contrib/tcpdump')
| -rw-r--r-- | contrib/tcpdump/tcpdump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c index 9c9609b932577..b1630818f6159 100644 --- a/contrib/tcpdump/tcpdump.c +++ b/contrib/tcpdump/tcpdump.c @@ -77,12 +77,12 @@ extern int SIZE_BUF; #ifdef __FreeBSD__ #include <sys/capsicum.h> #include <sys/sysctl.h> +#endif /* __FreeBSD__ */ +#ifdef HAVE_CAPSICUM #include <libcapsicum.h> #include <libcapsicum_dns.h> #include <libcapsicum_service.h> #include <nv.h> -#endif /* __FreeBSD__ */ -#ifdef HAVE_CAPSICUM #include <sys/capability.h> #include <sys/ioccom.h> #include <net/bpf.h> @@ -966,8 +966,8 @@ main(int argc, char **argv) FILE *VFile; #ifdef HAVE_CAPSICUM cap_rights_t rights; - int cansandbox; #endif /* HAVE_CAPSICUM */ + int cansandbox; #ifdef WIN32 if(wsockinit() != 0) return 1; |