]> git.proxmox.com Git - mirror_lxc.git/commitdiff
configure: fix -Wimplicit-fallthrough check
authorChristian Brauner <christian.brauner@ubuntu.com>
Fri, 28 Sep 2018 11:29:58 +0000 (13:29 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Fri, 28 Sep 2018 11:41:14 +0000 (13:41 +0200)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
configure.ac
src/lxc/compiler.h

index 8264c7c486db86e40e1c0818f6a10c192f136ab4..43c2b199f0bd5990a2b31e47faed5390915293db 100644 (file)
@@ -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])
 
index 5d1c0561ba493cd5a142212e8f33df8f9ebc9c43..7fd5ea131502ac2cc260f3f9f8007068376ff69e 100644 (file)
 #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