From owner-dev-commits-src-all@freebsd.org Fri Feb 26 10:14:12 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 7C1AB55C6A2; Fri, 26 Feb 2021 10:14:12 +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 4Dn59J2yCXz3M0K; Fri, 26 Feb 2021 10:14:12 +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 583ADBBF; Fri, 26 Feb 2021 10:14:12 +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 11QAEC1M040107; Fri, 26 Feb 2021 10:14:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11QAECun040106; Fri, 26 Feb 2021 10:14:12 GMT (envelope-from git) Date: Fri, 26 Feb 2021 10:14:12 GMT Message-Id: <202102261014.11QAECun040106@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 172f2fc11cc5 - main - dialog: guard macros definition to avoid redifinition 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/main X-Git-Reftype: branch X-Git-Commit: 172f2fc11cc560bbd3d3b29260a8ae21df6a541b 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: Fri, 26 Feb 2021 10:14:12 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=172f2fc11cc560bbd3d3b29260a8ae21df6a541b commit 172f2fc11cc560bbd3d3b29260a8ae21df6a541b Author: Baptiste Daroussin AuthorDate: 2021-02-26 10:13:43 +0000 Commit: Baptiste Daroussin CommitDate: 2021-02-26 10:13:43 +0000 dialog: guard macros definition to avoid redifinition This unbreaks building libdpv --- gnu/lib/libdialog/dlg_config.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gnu/lib/libdialog/dlg_config.h b/gnu/lib/libdialog/dlg_config.h index 1bd45183f509..30df29f877c6 100644 --- a/gnu/lib/libdialog/dlg_config.h +++ b/gnu/lib/libdialog/dlg_config.h @@ -9,12 +9,20 @@ #define CURSES_WACS_SYMBOLS 1 #define DIALOG_PATCHDATE 20210117 #define DIALOG_VERSION "1.3" +#ifndef GCC_NORETURN #define GCC_NORETURN __attribute__((noreturn)) +#endif #define GCC_PRINTF 1 +#ifndef GCC_PRINTFLIKE #define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var))) +#endif #define GCC_SCANF 1 +#ifndef GCC_SCANFLIKE #define GCC_SCANFLIKE(fmt,var) __attribute__((format(scanf,fmt,var))) +#endif +#ifndef GCC_UNUSED #define GCC_UNUSED __attribute__((unused)) +#endif #define HAVE_ALLOCA 1 #define HAVE_BTOWC 1 #define HAVE_COLOR 1