From d17947f8f3f26f435e601c0af4753418eee9cfef Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 26 Sep 2018 14:38:41 +0200 Subject: [PATCH] compiler: fix __noreturn on bionic Signed-off-by: Christian Brauner --- src/lxc/compiler.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h index 76a7b733d..59ad802da 100644 --- a/src/lxc/compiler.h +++ b/src/lxc/compiler.h @@ -20,6 +20,8 @@ #ifndef __LXC_COMPILER_H #define __LXC_COMPILER_H +#include + #include "config.h" #ifndef thread_local @@ -38,12 +40,18 @@ #define __fallthrough #endif -#ifndef _noreturn_ -#if __STDC_VERSION__ >= 201112L && !IS_BIONIC -#define __noreturn _Noreturn -#else -#define __noreturn __attribute__((noreturn)) -#endif +#ifndef __noreturn +# if __STDC_VERSION__ >= 201112L +# if !IS_BIONIC +# define __noreturn _Noreturn +# else +# define __noreturn __attribute__((__noreturn__)) +# endif +# elif IS_BIONIC +# define __noreturn __attribute__((__noreturn__)) +# else +# define __noreturn __attribute__((noreturn)) +# endif #endif #define __cgfsng_ops -- 2.47.2