svn commit: r306026 - head/usr.bin/bsdiff/bspatch

[Ed Maste]

Author: emaste
Date: Tue Sep 20 15:13:15 2016
New Revision: 306026
URL: https://svnweb.freebsd.org/changeset/base/306026

Log:
  bspatch: Remove backwards-compatibility sys/capability.h support
  
  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

Modified:
  head/usr.bin/bsdiff/bspatch/bspatch.c

Modified: head/usr.bin/bsdiff/bspatch/bspatch.c
==============================================================================
--- head/usr.bin/bsdiff/bspatch/bspatch.c	Tue Sep 20 13:23:08 2016	(r306025)
+++ head/usr.bin/bsdiff/bspatch/bspatch.c	Tue Sep 20 15:13:15 2016	(r306026)
@@ -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