Author: delphij
Date: Sat Jan 24 06:06:46 2015
New Revision: 277638
URL: https://svnweb.freebsd.org/changeset/base/277638
Log:
Don't include libcapsicum headers when requested.
Reported by: luigi
MFC after: 14 days
X-MFC-with: r276788
Modified:
head/contrib/tcpdump/tcpdump.c
Modified: head/contrib/tcpdump/tcpdump.c
==============================================================================
--- head/contrib/tcpdump/tcpdump.c Sat Jan 24 04:41:14 2015
(r277637)
+++ head/contrib/tcpdump/tcpdump.c Sat Jan 24 06:06:46 2015
(r277638)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
