Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Feb 2021 10:14:12 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 172f2fc11cc5 - main - dialog: guard macros definition to avoid redifinition
Message-ID:  <202102261014.11QAECun040106@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=172f2fc11cc560bbd3d3b29260a8ae21df6a541b

commit 172f2fc11cc560bbd3d3b29260a8ae21df6a541b
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2021-02-26 10:13:43 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102261014.11QAECun040106>