From owner-dev-commits-src-all@freebsd.org Tue Jan 19 21:38:24 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 F17C74E0895; Tue, 19 Jan 2021 21:38:23 +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 4DL28H3FV3z4lN4; Tue, 19 Jan 2021 21:38:23 +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 9BC5B5E0A; Tue, 19 Jan 2021 21:38:22 +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 10JLcMkt078536; Tue, 19 Jan 2021 21:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10JLcMg5078535; Tue, 19 Jan 2021 21:38:22 GMT (envelope-from git) Date: Tue, 19 Jan 2021 21:38:22 GMT Message-Id: <202101192138.10JLcMg5078535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alex Richardson Subject: git: 7954ad9f22b3 - main - Fix macro-redefined warning in gnu/diff for fputc_unlocked MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arichardson X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7954ad9f22b3b453c4cea49dc663e7b17631a209 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: Tue, 19 Jan 2021 21:38:24 -0000 The branch main has been updated by arichardson: URL: https://cgit.FreeBSD.org/src/commit/?id=7954ad9f22b3b453c4cea49dc663e7b17631a209 commit 7954ad9f22b3b453c4cea49dc663e7b17631a209 Author: Alex Richardson AuthorDate: 2021-01-19 11:35:15 +0000 Commit: Alex Richardson CommitDate: 2021-01-19 21:23:25 +0000 Fix macro-redefined warning in gnu/diff for fputc_unlocked While updating config.h to set HAVE_DECL_FPUTC_UNLOCKED to 1 also update the other macros that are defined in stdio.h. --- contrib/diff/config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/diff/config.h b/contrib/diff/config.h index ce405203c2b2..1de273fded16 100644 --- a/contrib/diff/config.h +++ b/contrib/diff/config.h @@ -86,7 +86,7 @@ /* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if you don't. */ -#define HAVE_DECL_FFLUSH_UNLOCKED 0 +#define HAVE_DECL_FFLUSH_UNLOCKED 1 /* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if you don't. */ @@ -94,19 +94,19 @@ /* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if you don't. */ -#define HAVE_DECL_FPUTC_UNLOCKED 0 +#define HAVE_DECL_FPUTC_UNLOCKED 1 /* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if you don't. */ -#define HAVE_DECL_FPUTS_UNLOCKED 0 +#define HAVE_DECL_FPUTS_UNLOCKED 1 /* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if you don't. */ -#define HAVE_DECL_FREAD_UNLOCKED 0 +#define HAVE_DECL_FREAD_UNLOCKED 1 /* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if you don't. */ -#define HAVE_DECL_FWRITE_UNLOCKED 0 +#define HAVE_DECL_FWRITE_UNLOCKED 1 /* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if you don't. */