svn commit: r203380 - projects/capabilities8/lib/libcapsicum

Robert Watson rwatson at FreeBSD.org
Tue Feb 2 16:15:51 UTC 2010


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'


More information about the svn-src-projects mailing list