freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 2257f9abf 2/2: * include/freetype/internal/compiler-m


From: Werner Lemberg
Subject: [freetype2] master 2257f9abf 2/2: * include/freetype/internal/compiler-macros.h (FALL_THROUGH): Update.
Date: Sun, 26 Feb 2023 15:05:54 -0500 (EST)

branch: master
commit 2257f9abf6e12daf7c3e1bfe28fa88de85e45785
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    * include/freetype/internal/compiler-macros.h (FALL_THROUGH): Update.
    
    This follows
    
      https://lists.gnu.org/archive/html/bug-gnulib/2023-02/msg00159.html
---
 include/freetype/internal/compiler-macros.h | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/freetype/internal/compiler-macros.h 
b/include/freetype/internal/compiler-macros.h
index 7883317fe..9d69086f0 100644
--- a/include/freetype/internal/compiler-macros.h
+++ b/include/freetype/internal/compiler-macros.h
@@ -41,8 +41,11 @@ FT_BEGIN_HEADER
 #  if ( defined( __STDC_VERSION__ ) && __STDC_VERSION__ > 201710L ) || \
       ( defined( __cplusplus ) && __cplusplus > 201402L )
 #    define FALL_THROUGH  [[__fallthrough__]]
-#  elif ( defined( __GNUC__ ) && __GNUC__ >= 7 )          || \
-        ( defined( __clang__ ) && __clang_major__ >= 10 )
+#  elif ( defined( __GNUC__ ) && __GNUC__ >= 7 )       || \
+        ( defined( __clang__ )                      &&    \
+          ( defined( __apple_build_version__ )            \
+              ? __apple_build_version__ >= 14000000       \
+              : __clang_major__ >= 10 ) )
 #    define FALL_THROUGH  __attribute__(( __fallthrough__ ))
 #  else
 #    define FALL_THROUGH  ( (void)0 )



reply via email to

[Prev in Thread] Current Thread [Next in Thread]