From bd89d4406327d3a30517443a4a518f49ebc99368 Mon Sep 17 00:00:00 2001 From: "ola.soder@axis.com" Date: Fri, 11 Feb 2022 19:27:55 +0000 Subject: patch 8.2.4347: in some build setups UNUSED is not defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Problem: In some build setups UNUSED is not defined. Solution: Change the logic of how UNUSED is defined. (Ola Söder, closes #9734) --- src/version.c | 2 ++ src/vim.h | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/version.c b/src/version.c index 07e46ae95e..f7599c0d08 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4347, /**/ 4346, /**/ diff --git a/src/vim.h b/src/vim.h index 166edf579f..4f95bb45f2 100644 --- a/src/vim.h +++ b/src/vim.h @@ -245,12 +245,19 @@ // Mark unused function arguments with UNUSED, so that gcc -Wunused-parameter // can be used to check for mistakes. -#if defined(HAVE_ATTRIBUTE_UNUSED) || defined(__MINGW32__) -# if !defined(UNUSED) +#ifndef UNUSED +# if defined(HAVE_ATTRIBUTE_UNUSED) || defined(__MINGW32__) # define UNUSED __attribute__((unused)) +# else +# if defined __has_attribute +# if __has_attribute(unused) +# define UNUSED __attribute__((unused)) +# endif +# endif +# endif +# ifndef UNUSED +# define UNUSED # endif -#else -# define UNUSED #endif // Used to check for "sun", "__sun" is used by newer compilers. -- cgit v1.2.3