Change noreturn macro to no_return to avoid header file problems

Change the "noreturn" macro to "no_return", to avoid problems with
system header files which use __attribute__((noreturn)) rather than
__attribute__((__noreturn__)) as is appropriate for system headers.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/compiler.h b/compiler.h
index 312b027a..d96ebcb4 100644
--- a/compiler.h
+++ b/compiler.h
@@ -174,9 +174,9 @@ char *strsep(char **, const char *);
  * How to tell the compiler that a function doesn't return
  */
 #ifdef __GNUC__
-# define noreturn void __attribute__((noreturn))
+# define no_return void __attribute__((noreturn))
 #else
-# define noreturn void
+# define no_return void
 #endif
 
 #endif	/* NASM_COMPILER_H */
diff --git a/nasmlib.c b/nasmlib.c
index 2dd3a658..6314dc64 100644
--- a/nasmlib.c
+++ b/nasmlib.c
@@ -205,7 +205,7 @@ char *nasm_strndup(const char *s, size_t len)
     return p;
 }
 
-noreturn nasm_assert_failed(const char *file, int line, const char *msg)
+no_return nasm_assert_failed(const char *file, int line, const char *msg)
 {
     nasm_malloc_error(ERR_FATAL, "assertion %s failed at %s:%d",
 		      msg, file, line);
diff --git a/nasmlib.h b/nasmlib.h
index 0cad760e..8abec1cb 100644
--- a/nasmlib.h
+++ b/nasmlib.h
@@ -171,7 +171,7 @@ char *nasm_strndup_log(const char *, int, const char *, size_t);
 /*
  * NASM assert failure
  */
-noreturn nasm_assert_failed(const char *, int, const char *);
+no_return nasm_assert_failed(const char *, int, const char *);
 #define nasm_assert(x)						\
     do {							\
 	if (unlikely(!(x)))					\