From owner-dev-commits-src-all@freebsd.org Wed Sep 22 10:31:09 2021 Return-Path: Delivered-To: dev-commits-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 C88916AF8F9; Wed, 22 Sep 2021 10:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HDvhs3WT3z4t8m; Wed, 22 Sep 2021 10:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8A9615BE8; Wed, 22 Sep 2021 10:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 18MAV6uW009291; Wed, 22 Sep 2021 10:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18MAV6kY009290; Wed, 22 Sep 2021 10:31:06 GMT (envelope-from git) Date: Wed, 22 Sep 2021 10:31:06 GMT Message-Id: <202109221031.18MAV6kY009290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f7419feda999 - stable/12 - Fix buildworld on Linux/macOS after nvi update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f7419feda99979db61a7d24d61c2cfe4ed89e206 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 10:31:10 -0000 The branch stable/12 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f7419feda99979db61a7d24d61c2cfe4ed89e206 commit f7419feda99979db61a7d24d61c2cfe4ed89e206 Author: Alex Richardson AuthorDate: 2020-10-12 10:42:24 +0000 Commit: Baptiste Daroussin CommitDate: 2021-09-22 10:28:54 +0000 Fix buildworld on Linux/macOS after nvi update This re-applies r365941 which was lost in the nvi update. (cherry picked from commit 5ce117c698bce69808f214781fe03a2c0f451d9f) --- contrib/nvi/common/common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/nvi/common/common.h b/contrib/nvi/common/common.h index dc4155610225..f2cb42fa9b9c 100644 --- a/contrib/nvi/common/common.h +++ b/contrib/nvi/common/common.h @@ -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 #include /* May refer to the bundled regex. */