From owner-svn-src-head@freebsd.org Mon Sep 19 16:07:34 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3A0EDBE106A; Mon, 19 Sep 2016 16:07:34 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0982590E; Mon, 19 Sep 2016 16:07:33 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8JG7Xd6033144; Mon, 19 Sep 2016 16:07:33 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8JG7X6N033143; Mon, 19 Sep 2016 16:07:33 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201609191607.u8JG7X6N033143@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 19 Sep 2016 16:07:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r305980 - head/usr.sbin/uefisign X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Sep 2016 16:07:34 -0000 Author: emaste Date: Mon Sep 19 16:07:32 2016 New Revision: 305980 URL: https://svnweb.freebsd.org/changeset/base/305980 Log: uefisign: Remove backwards-compatibility sys/capability.h support uefisign previously included sys/capability.h or sys/capsicum.h based on __FreeBSD_version in order to facilitate development on the stable branch. The Capsicum header is now installed as sys/capsicum.h in stable/10 and FreeBSD 10.3, so there's no need for the backwards compatibility support. Reviewed by: trasz Sponsored by: The FreeBSD Foundation Modified: head/usr.sbin/uefisign/child.c Modified: head/usr.sbin/uefisign/child.c ============================================================================== --- head/usr.sbin/uefisign/child.c Mon Sep 19 16:05:10 2016 (r305979) +++ head/usr.sbin/uefisign/child.c Mon Sep 19 16:07:32 2016 (r305980) @@ -32,11 +32,7 @@ __FBSDID("$FreeBSD$"); #include -#if __FreeBSD_version >= 1100000 #include -#else -#include -#endif #include #include #include