From 56cee16efd9ff9d1b4b976e128bf05162bd0c85f Mon Sep 17 00:00:00 2001 From: Tormod Volden Date: Fri, 8 Dec 2023 22:52:08 +0100 Subject: [PATCH] tests/umockdev: Avoid unknown warning option on older gcc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to https://gcc.gnu.org/wiki/StaticAnalyzer the -Wanalyzer-malloc-leak and -Wanalyzer-file-leak options came in GCC 10. When building with GCC 9 there would be warnings: CC umockdev-umockdev.o ../../libusb-git/tests/umockdev.c:37:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas] 37 | #pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak" | ^~~~~~~~~~~~~~~~~~~~~~~~ ../../libusb-git/tests/umockdev.c:38:32: error: unknown option after ‘#pragma GCC diagnostic’ kind [-Werror=pragmas] 38 | #pragma GCC diagnostic ignored "-Wanalyzer-file-leak" | ^~~~~~~~~~~~~~~~~~~~~~ Closes #1369 Signed-off-by: Tormod Volden --- libusb/version_nano.h | 2 +- tests/umockdev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 4c6b16d..010c8ec 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11844 +#define LIBUSB_NANO 11845 diff --git a/tests/umockdev.c b/tests/umockdev.c index 67b7474..ec0a07b 100644 --- a/tests/umockdev.c +++ b/tests/umockdev.c @@ -33,7 +33,7 @@ #define UNUSED_DATA __attribute__ ((unused)) gconstpointer unused_data /* avoid leak reports inside assertions; leaking stuff on assertion failures does not matter in tests */ -#if !defined(__clang__) +#if !defined(__clang__) && __GNUC__ > 9 #pragma GCC diagnostic ignored "-Wanalyzer-malloc-leak" #pragma GCC diagnostic ignored "-Wanalyzer-file-leak" #endif