From owner-p4-projects@FreeBSD.ORG Thu Feb 2 21:37:15 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 0609216A423; Thu, 2 Feb 2006 21:37:15 +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 BC16616A420 for ; Thu, 2 Feb 2006 21:37:14 +0000 (GMT) (envelope-from roam@ringlet.net) Received: from straylight.ringlet.net (nat114.cnsys.bg [85.95.80.114]) by mx1.FreeBSD.org (Postfix) with SMTP id CF00B43D60 for ; Thu, 2 Feb 2006 21:37:08 +0000 (GMT) (envelope-from roam@ringlet.net) Received: (qmail 1865 invoked by uid 1000); 2 Feb 2006 21:37:05 -0000 Date: Thu, 2 Feb 2006 23:37:04 +0200 From: Peter Pentchev To: Pawel Worach Message-ID: <20060202213704.GA956@straylight.m.ringlet.net> References: <200601312102.k0VL24It078902@repoman.freebsd.org> <43E1C275.8070600@gmail.com> <200602021340.03928.jhb@freebsd.org> <43E27874.9060409@gmail.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline In-Reply-To: <43E27874.9060409@gmail.com> User-Agent: Mutt/1.5.11 Cc: Perforce Change Reviews , Robert Watson , John Baldwin 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:37:15 -0000 --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Feb 02, 2006 at 10:24:04PM +0100, Pawel Worach wrote: > John Baldwin wrote: > > > >Actually, I think && is right. The conditional code is meant to be=20 > >exposed to userland and not the kernel and _KERNEL is for FreeBSD and=20 > >KERNEL for OS X. > > >=20 > Aha, in that case the #endif comment needs updating :) >=20 > --- 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) */ It seems that it ought indeed to be changed, but *with* the '!'s before the conditions - a && b and !a && !b are two completely different things, y'know :) !a && !b and a || b are related, true, but style(9) seems to say that it should indeed be !a && !b in this case. G'luck, Peter --=20 Peter Pentchev roam@ringlet.net roam@cnsys.bg roam@FreeBSD.org PGP key: http://people.FreeBSD.org/~roam/roam.key.asc Key fingerprint FDBA FD79 C26F 3C51 C95E DF9E ED18 B68D 1619 4553 If this sentence didn't exist, somebody would have invented it. --SLDf9lqlvOQaIe6s Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (FreeBSD) iD8DBQFD4nuA7Ri2jRYZRVMRAr8kAJ42IOM7S/qZbbKwsFUtpj+CuNmAbQCfaczr 017DzHFlzS0YXxJtftcKUQg= =LAsj -----END PGP SIGNATURE----- --SLDf9lqlvOQaIe6s--