svn commit: r366634 - head/contrib/nvi/common

[Alexander Richardson]

On Mon, 12 Oct 2020 at 14:55, Jessica Clarke <jrtc27 at freebsd.org> wrote:
>
> On 12 Oct 2020, at 11:42, Alex Richardson <arichardson at 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.