From owner-svn-src-all@freebsd.org Mon Oct 12 13:57:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8E80438578; Mon, 12 Oct 2020 13:57:48 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C90cX2zlGz4Fpx; Mon, 12 Oct 2020 13:57:48 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id u8so23341086ejg.1; Mon, 12 Oct 2020 06:57:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=w3cntkWgkptBUAAQjjl2bbOjuqrRsZ5T/RIeYSUgNqc=; b=QGp9IcMwaifZwHwR1yuLgbrjDM0fCXjCas60vb9nGQjDGvvW1mlEMZDqK1uz4CN2+D DnPJK3FePn+g3338g5MtmljQH908dicpd/6zRSmdhsadisFCzHWhZY/S8GqFVaBo9fum jsePYbBth45zNHYR0EXnQMNcx2qBbNgO5woPqquEBeMUI9+bNYI0E1uLIaJYPNg+f2hJ 1A+8+sWbgzMXe85RmggmivFHtv/TD7DQW2elBz0U2l6KxE4RljIlCkd300nCM2HB6H8g MMlNwoXEMbj351qJWx6qYID3Sd6m9f+7S4g8XI1JCOEosGwRqi+lhsGYUHyednorOmHv w2vQ== X-Gm-Message-State: AOAM533Hgx6slgEwIAm2QTTQ23SGejtDjjoqK9SP6VsWJ31eWjrMoSQh XCZdJO1n53L59rKD6+hdKs/R/u7d9+pkqQ== X-Google-Smtp-Source: ABdhPJxP72vpAxibhqSkho2k99YRL6ZPuliUnR2ueeCgIQ4B2pf/vDTk1F13slu2UB+LuYL24Bg6oQ== X-Received: by 2002:a17:906:fb86:: with SMTP id lr6mr27973002ejb.510.1602511066806; Mon, 12 Oct 2020 06:57:46 -0700 (PDT) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com. [209.85.128.47]) by smtp.gmail.com with ESMTPSA id rs18sm10783007ejb.69.2020.10.12.06.57.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 12 Oct 2020 06:57:46 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id b127so4818844wmb.3; Mon, 12 Oct 2020 06:57:46 -0700 (PDT) X-Received: by 2002:a05:600c:2707:: with SMTP id 7mr11233878wmm.147.1602511066042; Mon, 12 Oct 2020 06:57:46 -0700 (PDT) MIME-Version: 1.0 References: <202010121042.09CAgOYV071542@repo.freebsd.org> In-Reply-To: From: Alexander Richardson Date: Mon, 12 Oct 2020 14:57:35 +0100 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r366634 - head/contrib/nvi/common To: Jessica Clarke Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4C90cX2zlGz4Fpx X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Oct 2020 13:57:48 -0000 On Mon, 12 Oct 2020 at 14:55, Jessica Clarke wrote: > > On 12 Oct 2020, at 11:42, Alex Richardson 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 /* Only include db1. */ > > #endif > > Can this not be expressed more nicely as the following? > > /* Only include db1 */ > #if __has_include() > #include > #else > #include > #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.