From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Fri, 28 Sep 2018 11:29:58 +0000 (+0200)
Subject: configure: fix -Wimplicit-fallthrough check
X-Git-Tag: lxc-3.1.0~76^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c73fbad129b65ba1a5e856f371c5aa233a3bb45f;p=thirdparty%2Flxc.git

configure: fix -Wimplicit-fallthrough check

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/configure.ac b/configure.ac
index 8264c7c48..43c2b199f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -684,7 +684,7 @@ AC_PROG_SED
 LXC_CHECK_TLS
 
 AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="$CFLAGS -fdiagnostics-color"],,[-Werror])
-AX_CHECK_COMPILE_FLAG([-implicit-fallthrough], [CFLAGS="$CFLAGS -Wimplicit-fallthrough"],,[-Werror])
+AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough], [CFLAGS="$CFLAGS -Wimplicit-fallthrough"],,[-Werror])
 AX_CHECK_COMPILE_FLAG([-Wcast-align], [CFLAGS="$CFLAGS -Wcast-align"],,[-Werror])
 AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS="$CFLAGS -Wstrict-prototypes"],,[-Werror])
 
diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h
index 5d1c0561b..7fd5ea131 100644
--- a/src/lxc/compiler.h
+++ b/src/lxc/compiler.h
@@ -37,10 +37,8 @@
 #endif
 #endif
 
-#if defined(__GNUC__) && __GNUC__ >= 7 || defined(__clang__)
-#define __fallthrough __attribute__((fallthrough))
-#else
-#define __fallthrough
+#ifndef __fallthrough
+#define __fallthrough /* fall through */
 #endif
 
 #ifndef __noreturn