From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 18 21:35:22 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C90FC1065694;
	Mon, 18 Jan 2010 21:35:22 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B992D8FC1D;
	Mon, 18 Jan 2010 21:35:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ILZMVH084602;
	Mon, 18 Jan 2010 21:35:22 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0ILZMxl084600;
	Mon, 18 Jan 2010 21:35:22 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201001182135.o0ILZMxl084600@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 18 Jan 2010 21:35:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r202594 - projects/capabilities8/sys/sys
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jan 2010 21:35:22 -0000

Author: rwatson
Date: Mon Jan 18 21:35:22 2010
New Revision: 202594
URL: http://svn.freebsd.org/changeset/base/202594

Log:
  Merge P4 changeset 169523 to capabilities8:
  
    Add __BEGIN_DECLS/__END_DECLS to capability.h to make it (more)
    C++-friendly.
  
    Submitted by: Jonathan Anderson

Modified:
  projects/capabilities8/sys/sys/capability.h

Modified: projects/capabilities8/sys/sys/capability.h
==============================================================================
--- projects/capabilities8/sys/sys/capability.h	Mon Jan 18 21:28:11 2010	(r202593)
+++ projects/capabilities8/sys/sys/capability.h	Mon Jan 18 21:35:22 2010	(r202594)
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#24 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/sys/sys/capability.h#25 $
  */
 
 /*
@@ -39,6 +39,7 @@
 #ifndef _SYS_CAPABILITY_H_
 #define	_SYS_CAPABILITY_H_
 
+#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /*
@@ -159,6 +160,7 @@ cap_rights_t	cap_rights(struct file *fp_
 
 #else /* !_KERNEL */
 
+__BEGIN_DECLS
 /*
  * cap_enter(): Cause the process to enter capability mode, which will
  * prevent it from directly accessing global namespaces.  System calls will
@@ -183,6 +185,7 @@ int	cap_new(int fd, cap_rights_t rights)
  * cap_getrights(): Query the rights on a capability.
  */
 int	cap_getrights(int fd, cap_rights_t *rightsp);
+__END_DECLS
 
 #endif /* !_KERNEL */