Merge pull request #2648 from brauner/2018-09-26/compiler_attributes

[mirror_lxc.git] / src / lxc / compiler.h

diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h
index b6fbbc0e07cacd873c4a9788519069ed12f0a8e7..12214b9b1ee9925eecb64b0ef9c7285319c070e5 100644 (file)
--- a/src/lxc/compiler.h
+++ b/src/lxc/compiler.h
@@ -20,6 +20,8 @@
 #ifndef __LXC_COMPILER_H
 #define __LXC_COMPILER_H
 
+#include <sys/cdefs.h>
+
 #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
 
 #ifndef __hot