From c7d7c31ced7575de8078a7c1389049dbe02a8f50 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 26 Feb 2023 16:56:19 +0100 Subject: [PATCH] dfa: Avoid warnings with some Apple clang versions. Reported by Werner Lemberg in . * lib/dfa.c (FALLTHROUGH): When __apple_build_version__ is defined, ignore __clang_major__. --- ChangeLog | 8 ++++++++ lib/dfa.c | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3d8446ce5c..9477335e75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-02-26 Bruno Haible + + dfa: Avoid warnings with some Apple clang versions. + Reported by Werner Lemberg in + . + * lib/dfa.c (FALLTHROUGH): When __apple_build_version__ is defined, + ignore __clang_major__. + 2023-02-25 Jim Meyering announce-gen: add more info the auto-generated announce template diff --git a/lib/dfa.c b/lib/dfa.c index 211e1ed18f..994900fea2 100644 --- a/lib/dfa.c +++ b/lib/dfa.c @@ -67,7 +67,10 @@ c_isdigit (char c) #ifndef FALLTHROUGH # if 201710L < __STDC_VERSION__ # define FALLTHROUGH [[__fallthrough__]] -# elif (__GNUC__ >= 7) || (__clang_major__ >= 10) +# elif ((__GNUC__ >= 7) \ + || (defined __apple_build_version__ \ + ? __apple_build_version__ >= 14000000 \ + : __clang_major__ >= 10)) # define FALLTHROUGH __attribute__ ((__fallthrough__)) # else # define FALLTHROUGH ((void) 0) -- 2.39.5