From owner-p4-projects@FreeBSD.ORG Thu Feb 2 21:24:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B2C716A424; Thu, 2 Feb 2006 21:24:10 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 32A2316A420 for ; Thu, 2 Feb 2006 21:24:10 +0000 (GMT) (envelope-from pawel.worach@gmail.com) Received: from uproxy.gmail.com (uproxy.gmail.com [66.249.92.201]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEBFE43D5D for ; Thu, 2 Feb 2006 21:24:08 +0000 (GMT) (envelope-from pawel.worach@gmail.com) Received: by uproxy.gmail.com with SMTP id o2so46571uge for ; Thu, 02 Feb 2006 13:24:07 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:user-agent:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding; b=uhovpFmSEOOxW/MzFr2ej3Y27zXwYPzW3MEFR+L2/6cb8ii1QymBtRlsXEDJCu1i3njqqjb/hyxxMzoc+2xwt8JSVf3zWGg6OVENYagiHYUkTFF2OnX8dvahPA7f69EA2FkE/oXgGLwT5HpF0XAP9de+pEn17WAHxLFbDsRI3no= Received: by 10.67.31.9 with SMTP id i9mr557946ugj; Thu, 02 Feb 2006 13:24:07 -0800 (PST) Received: from ?192.168.0.107? ( [80.217.193.226]) by mx.gmail.com with ESMTP id k30sm1673331ugc.2006.02.02.13.24.06; Thu, 02 Feb 2006 13:24:07 -0800 (PST) Message-ID: <43E27874.9060409@gmail.com> Date: Thu, 02 Feb 2006 22:24:04 +0100 From: Pawel Worach User-Agent: Thunderbird 1.5 (X11/20060129) MIME-Version: 1.0 To: John Baldwin References: <200601312102.k0VL24It078902@repoman.freebsd.org> <43E1C275.8070600@gmail.com> <200602021340.03928.jhb@freebsd.org> In-Reply-To: <200602021340.03928.jhb@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews , Robert Watson Subject: Re: PERFORCE change 90830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2006 21:24:11 -0000 John Baldwin wrote: > > Actually, I think && is right. The conditional code is meant to be exposed to > userland and not the kernel and _KERNEL is for FreeBSD and KERNEL for OS X. > Aha, in that case the #endif comment needs updating :) --- sys/bsm/audit.h.orig Thu Feb 2 21:40:33 2006 +++ sys/bsm/audit.h Thu Feb 2 21:40:44 2006 @@ -338,7 +338,7 @@ int setaudit(const struct auditinfo *); int getaudit_addr(struct auditinfo_addr *, int); int setaudit_addr(const struct auditinfo_addr *, int); -#endif /* defined(_KERNEL) || defined(KERNEL) */ +#endif /* defined(_KERNEL) && defined(KERNEL) */ __END_DECLS -- Pawel