From owner-svn-src-projects@FreeBSD.ORG  Tue Feb  2 16:15:51 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 586DB1065693;
	Tue,  2 Feb 2010 16:15:51 +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 4925D8FC13;
	Tue,  2 Feb 2010 16:15:51 +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 o12GFp0a008038;
	Tue, 2 Feb 2010 16:15:51 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o12GFp1Q008036;
	Tue, 2 Feb 2010 16:15:51 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201002021615.o12GFp1Q008036@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Tue, 2 Feb 2010 16:15:51 +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: r203380 - projects/capabilities8/lib/libcapsicum
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: Tue, 02 Feb 2010 16:15:51 -0000

Author: rwatson
Date: Tue Feb  2 16:15:50 2010
New Revision: 203380
URL: http://svn.freebsd.org/changeset/base/203380

Log:
  Fix merge-o when bringing libcapsicum changes back to capabilities8.

Modified:
  projects/capabilities8/lib/libcapsicum/libcapsicum.h

Modified: projects/capabilities8/lib/libcapsicum/libcapsicum.h
==============================================================================
--- projects/capabilities8/lib/libcapsicum/libcapsicum.h	Tue Feb  2 16:12:39 2010	(r203379)
+++ projects/capabilities8/lib/libcapsicum/libcapsicum.h	Tue Feb  2 16:15:50 2010	(r203380)
@@ -227,9 +227,6 @@ int	ld_insandbox(void);
  */
 int	ld_libdirs(int *fds, int *fdlen);
 
-/* If this call is successful, the caller is responsible for freeing 'fds'. */
-int	ld_libdirs(int **fds);
-
 /*
  * Applications may declare an alternative entry point to the default ELF
  * entry point for their binary, which will be used in preference to 'main'