d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bspatch: Remove backwards-compatibility sys/capability.h support

Browse Source 
bspatch previously included sys/capability.h or sys/capsicum.h based
on __FreeBSD_version, as FreeBSD is the upstream for bsdiff and we may
see this file incorporated into other third-party software.

The Capsicum header is now installed as sys/capsicum.h in stable/10 and
FreeBSD 10.3, so we can just use sys/capsicum.h and simplify the logic.

Reviewed by:	allanjude
Differential Revision:	https://reviews.freebsd.org/D7954
This commit is contained in:
emaste 2016-09-20 15:13:15 +00:00
parent 506a35e5a5
commit 484e27fa03
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.bin/bsdiff/bspatch/bspatch.c
View File

@ -29,12 +29,9 @@ __FBSDID("$FreeBSD$");
#if defined(__FreeBSD__)
#include <sys/param.h>
#if __FreeBSD_version >= 1100014
#if __FreeBSD_version >= 1001511
#include <sys/capsicum.h>
#define HAVE_CAPSICUM
#elif __FreeBSD_version >= 1000000
#include <sys/capability.h>
#define HAVE_CAPSICUM
#endif
#endif