From owner-svn-soc-all@FreeBSD.ORG  Mon Jun 17 10:43:57 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 54D20B67
 for <svn-soc-all@FreeBSD.org>; Mon, 17 Jun 2013 10:43:57 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::16:124])
 by mx1.freebsd.org (Postfix) with ESMTP id 4735E1AA9
 for <svn-soc-all@FreeBSD.org>; Mon, 17 Jun 2013 10:43:57 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5HAhvXO091824
 for <svn-soc-all@FreeBSD.org>; Mon, 17 Jun 2013 10:43:57 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r5HAhvuv091822
 for svn-soc-all@FreeBSD.org; Mon, 17 Jun 2013 10:43:57 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Mon, 17 Jun 2013 10:43:57 GMT
Message-Id: <201306171043.r5HAhvuv091822@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r253071 - soc2013/dpl/bzip2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jun 2013 10:43:57 -0000

Author: dpl
Date: Mon Jun 17 10:43:57 2013
New Revision: 253071
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=253071

Log:
  
  
  Submitted by:dpl

Modified:
  soc2013/dpl/bzip2/bzip2.c

Modified: soc2013/dpl/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/bzip2/bzip2.c	Mon Jun 17 10:41:51 2013	(r253070)
+++ soc2013/dpl/bzip2/bzip2.c	Mon Jun 17 10:43:57 2013	(r253071)
@@ -93,7 +93,7 @@
 #		include <osreldate.h>
 #		if __FreeBSD_version >= 900041
 #			define CAPSICUM
-#			include <sys/capabilities.h>
+#			include <sys/capability.h>
 #		endif
 #	endif
 
@@ -1822,7 +1822,7 @@
 #  endif
 
 	/* Enter in Capability mode */
-#	if CAPSICUM
+#	ifdef CAPSICUM
 	cap_enter();
 #	endif