From owner-svn-src-head@freebsd.org Tue May 24 15:53:28 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EDCF2B482AF; Tue, 24 May 2016 15:53:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CD8C31D6E; Tue, 24 May 2016 15:53:28 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from ralph.baldwin.cx (c-73-231-226-104.hsd1.ca.comcast.net [73.231.226.104]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id DDCE0B978; Tue, 24 May 2016 11:53:26 -0400 (EDT) From: John Baldwin To: Alan Somers Cc: Peter Wemm , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r300557 - head/usr.sbin/apmd Date: Tue, 24 May 2016 08:52:32 -0700 Message-ID: <2084098.Ir36lcS1Gf@ralph.baldwin.cx> User-Agent: KMail/4.14.3 (FreeBSD/10.2-STABLE; KDE/4.14.3; amd64; ; ) In-Reply-To: References: <201605240315.u4O3FkMt001717@repo.freebsd.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Tue, 24 May 2016 11:53:27 -0400 (EDT) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 May 2016 15:53:29 -0000 On Monday, May 23, 2016 09:24:41 PM Alan Somers wrote: > On Mon, May 23, 2016 at 9:15 PM, Peter Wemm wrote: > > > Author: peter > > Date: Tue May 24 03:15:46 2016 > > New Revision: 300557 > > URL: https://svnweb.freebsd.org/changeset/base/300557 > > > > Log: > > It seems is a new prerequisite for after > > r300539. Attempt to fix the build for i386. > > > > Modified: > > head/usr.sbin/apmd/apmd.c > > head/usr.sbin/apmd/apmdlex.l > > head/usr.sbin/apmd/apmdparse.y > > > > > Are you sure this is necessary, even after 300544? Actually, we try to avoid nested includes when possible for userland, so I'd be inclined to drop the nested include and just add to the places that need it. Userland code in the base system is supposed to have or as the first #include anyway (which apmd was not following), so any fixes to userland are probably style fixes anyway. -- John Baldwin