diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-10-18 03:21:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-18 03:21:04 +0000 |
| commit | 8e77a75afbfbe76ed641379d5f73b92cbf37d006 (patch) | |
| tree | ae363805e8be7812ad3a88ff8f28cd1380d7ac92 /include/freetype/internal/compiler-macros.h | |
| parent | e4a6cc6f5bc957b9e282e863832d441c74d71bfa (diff) | |
| parent | 6487a5bb15b26f09baa84eeed2fdf3bc77be5bf8 (diff) | |
| download | freetype-8e77a75afbfbe76ed641379d5f73b92cbf37d006.tar.gz | |
Merge "Update FreeType to 2.13.2" into main am: 2aeec9fb95 am: 6487a5bb15
Original change: https://android-review.googlesource.com/c/platform/external/freetype/+/2792273
Change-Id: I6e0198bf347cd2898db63dd4ae5e876b178e1391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'include/freetype/internal/compiler-macros.h')
| -rw-r--r-- | include/freetype/internal/compiler-macros.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/freetype/internal/compiler-macros.h b/include/freetype/internal/compiler-macros.h index 7883317fe..6f6765097 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__ >= 12000000 \ + : __clang_major__ >= 10 ) ) # define FALL_THROUGH __attribute__(( __fallthrough__ )) # else # define FALL_THROUGH ( (void)0 ) |