Author: delphij
Date: Thu Jul 18 07:26:30 2019
New Revision: 350108
URL: https://svnweb.freebsd.org/changeset/base/350108

Log:
  Remove support for FreeBSD 10.x.
  
  MFC after:    1 month

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

Modified: head/usr.bin/bsdiff/bspatch/bspatch.c
==============================================================================
--- head/usr.bin/bsdiff/bspatch/bspatch.c       Thu Jul 18 04:46:30 2019        
(r350107)
+++ head/usr.bin/bsdiff/bspatch/bspatch.c       Thu Jul 18 07:26:30 2019        
(r350108)
@@ -29,13 +29,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#if defined(__FreeBSD__)
-#include <sys/param.h>
-#if __FreeBSD_version >= 1001511
+#ifndef WITHOUT_CAPSICUM
 #include <sys/capsicum.h>
-#define HAVE_CAPSICUM
 #endif
-#endif
 
 #include <bzlib.h>
 #include <err.h>
@@ -107,7 +103,7 @@ int main(int argc, char *argv[])
        off_t oldpos, newpos;
        off_t ctrl[3];
        off_t i, lenread, offset;
-#ifdef HAVE_CAPSICUM
+#ifndef WITHOUT_CAPSICUM
        cap_rights_t rights_dir, rights_ro, rights_wr;
 #endif
 
@@ -143,7 +139,7 @@ int main(int argc, char *argv[])
                err(1, "open(%s)", argv[2]);
        atexit(exit_cleanup);
 
-#ifdef HAVE_CAPSICUM
+#ifndef WITHOUT_CAPSICUM
        if (cap_enter() < 0)
                err(1, "failed to enter security sandbox");
 
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Reply via email to