From owner-svn-src-all@freebsd.org Mon Oct 12 13:55:27 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 3C8704389BE for ; Mon, 12 Oct 2020 13:55:27 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 4C90Yp2v9Lz4Fdc for ; Mon, 12 Oct 2020 13:55:26 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: by mail-wr1-f53.google.com with SMTP id n18so19304695wrs.5 for ; Mon, 12 Oct 2020 06:55:26 -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:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ardN/b4qBBCaQBGCWzvr8BXozcrBZWW9aokXQEV8sUk=; b=GE6DuKwMQ/GgxhBWW5YJxTgAQf/kDcJdUchJ+fRoFmbK4ZgUZQyvbCRWTu7OjJY8Vq EqnKGmOhC9HnDSxVbvYlRZZsvkaTleDkFt6ldgk0m9Wa9LVqUgAbuu5yseK3vPYFRJGC Om+PP48IVqKQfBUUda4l7dAtruVOW9UauIXUaWEd2e1GFdbdGARs55I1siJI9fqbxJrU FFOG+9qZnRBNdrrjcmrgUFpiKU1C7HpK6mZ6LN0Fl3vIFDw/wQmd2rpghNcKPSpVGkC2 gMpnP7YWuby1HUYKQ0YMXIrig7TqQ9rW0d3gV7uLFBswcMrOADK8Y3St/PksDR/l4+Oe iB4w== X-Gm-Message-State: AOAM532sjZLkbKzTZ1GhYNkTF98hP8hbIwjn43vCrpaS58+sbjG41NDO Bz/X2PMKrVrlkuWMRSlwjtJcWQ== X-Google-Smtp-Source: ABdhPJwvVgpPrBb1v9ORBmbaM71NQgvgkJhF+duYOComuoOosbzdwdodDk0lko+QA11QVHRf3haDUA== X-Received: by 2002:adf:bbd2:: with SMTP id z18mr32209101wrg.166.1602510924663; Mon, 12 Oct 2020 06:55:24 -0700 (PDT) Received: from [192.168.149.251] (trinity-students-nat.trin.cam.ac.uk. [131.111.193.104]) by smtp.gmail.com with ESMTPSA id n4sm10148494wrr.91.2020.10.12.06.55.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2020 06:55:23 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Subject: Re: svn commit: r366634 - head/contrib/nvi/common From: Jessica Clarke In-Reply-To: <202010121042.09CAgOYV071542@repo.freebsd.org> Date: Mon, 12 Oct 2020 14:55:21 +0100 Cc: src-committers , svn-src-all , svn-src-head@freebsd.org Content-Transfer-Encoding: 7bit Message-Id: References: <202010121042.09CAgOYV071542@repo.freebsd.org> To: Alex Richardson X-Mailer: Apple Mail (2.3608.120.23.2.1) X-Rspamd-Queue-Id: 4C90Yp2v9Lz4Fdc X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.221.53 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com X-Spamd-Result: default: False [-1.89 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; RCVD_COUNT_THREE(0.00)[3]; NEURAL_HAM_SHORT(-0.41)[-0.405]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; MID_RHS_MATCH_FROM(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.01)[-1.010]; FREEFALL_USER(0.00)[jrtc27]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-0.97)[-0.971]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.221.53:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.221.53:from]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[svn-src-all] 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:55:27 -0000 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