Date: Mon, 12 Oct 2020 14:57:35 +0100 From: Alexander Richardson <arichardson@freebsd.org> To: Jessica Clarke <jrtc27@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r366634 - head/contrib/nvi/common Message-ID: <CA%2BZ_v8rnKd05qf5YgKDhrsDw9KKY7MUTXuv-1UeW-Lr1v%2BmvdA@mail.gmail.com> In-Reply-To: <BAA9B321-AE1A-40E8-BA91-5274F11E30DE@freebsd.org> References: <202010121042.09CAgOYV071542@repo.freebsd.org> <BAA9B321-AE1A-40E8-BA91-5274F11E30DE@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 12 Oct 2020 at 14:55, Jessica Clarke <jrtc27@freebsd.org> wrote: > > On 12 Oct 2020, at 11:42, Alex Richardson <arichardson@FreeBSD.org> wrote: > > --- head/contrib/nvi/common/common.h Mon Oct 12 10:42:19 2020 (r366633) > > +++ head/contrib/nvi/common/common.h Mon Oct 12 10:42:24 2020 (r366634) > > @@ -14,7 +14,7 @@ > > #ifdef __linux__ > > #include "/usr/include/db1/db.h" /* Only include db1. */ > > #else > > -#include "/usr/include/db.h" /* Only include db1. */ > > +#include <db.h> /* Only include db1. */ > > #endif > > Can this not be expressed more nicely as the following? > > /* Only include db1 */ > #if __has_include(<db1/db.h>) > #include <db1/db.h> > #else > #include <db.h> > #endif > > Jess > Yes it could, but I'd prefer it if upstream fixes it instead so we can drop this diff. See also https://github.com/lichray/nvi2/issues/69.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CA%2BZ_v8rnKd05qf5YgKDhrsDw9KKY7MUTXuv-1UeW-Lr1v%2BmvdA>