From 467a5d31ce23bfeef9eca5d8f4000b442711bc67 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 25 Aug 2024 15:18:45 -0700 Subject: [PATCH] =?utf8?q?diffseq:=20don=E2=80=99t=20worry=20about=20clang?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * lib/diffseq.h: Stop worrying about __clang__ for pragmas. This basically reverts the previous change to this file. Problem reported by Bruno Haible in: https://lists.gnu.org/r/bug-gnulib/2024-08/msg00145.html --- ChangeLog | 8 ++++++++ lib/diffseq.h | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index dd0b9a5d2f..118cfdac75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-08-25 Paul Eggert + + diffseq: don’t worry about clang + * lib/diffseq.h: Stop worrying about __clang__ for pragmas. + This basically reverts the previous change to this file. + Problem reported by Bruno Haible in: + https://lists.gnu.org/r/bug-gnulib/2024-08/msg00145.html + 2024-08-24 Bruno Haible copy-file: Add functions for copying non-confidential files. diff --git a/lib/diffseq.h b/lib/diffseq.h index 5f1f173363..f86ac4f7ee 100644 --- a/lib/diffseq.h +++ b/lib/diffseq.h @@ -95,7 +95,7 @@ /* Suppress gcc's "...may be used before initialized" warnings, generated by GCC versions up to at least GCC 14.2. Likewise for gcc -fanalyzer's "use of uninitialized value" warnings. */ -#if 4 <= __GNUC__ + (7 <= __GNUC_MINOR__) && !__clang__ +#if 4 <= __GNUC__ + (7 <= __GNUC_MINOR__) # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wmaybe-uninitialized" # if 13 <= __GNUC__ @@ -558,7 +558,7 @@ compareseq (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, #undef XREF_YREF_EQUAL } -#if 4 <= __GNUC__ + (7 <= __GNUC_MINOR__) && !__clang__ +#if 4 <= __GNUC__ + (7 <= __GNUC_MINOR__) # pragma GCC diagnostic pop #endif -- 2.39.5