diff options
| author | Martin Matuška <mm@FreeBSD.org> | 2021-12-20 23:28:43 +0100 |
|---|---|---|
| committer | Tony Hutter <hutter2@llnl.gov> | 2022-02-03 15:28:01 -0800 |
| commit | 14bf91a0431e6b410ec9cf029172dfc5a99eb58f (patch) | |
| tree | 89aac16411c34d242c34efe4e027fcd395a37235 | |
| parent | 1833de81033e0bac0f68d1d3dc5f35454efc019a (diff) | |
FreeBSD: fix world build after 143476ce8
Do not redefine the fallthrough macro when building with libcpp.
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Martin Matuska <mm@FreeBSD.org>
Closes #12880
| -rw-r--r-- | lib/libspl/include/sys/feature_tests.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libspl/include/sys/feature_tests.h b/lib/libspl/include/sys/feature_tests.h index a36fd7b8c..c9564b2c3 100644 --- a/lib/libspl/include/sys/feature_tests.h +++ b/lib/libspl/include/sys/feature_tests.h @@ -30,7 +30,7 @@ #define ____cacheline_aligned #define __NORETURN __attribute__((__noreturn__)) -#if !defined(fallthrough) +#if !defined(fallthrough) && !defined(_LIBCPP_VERSION) #if defined(HAVE_IMPLICIT_FALLTHROUGH) #define fallthrough __attribute__((__fallthrough__)) #else |