commit 287268e70213b3ff9ba30cada45853214cd36a0c
author H. Peter Anvin <hpa@zytor.com> Sun Jun 25 15:03:47 2006 -0700
committer H. Peter Anvin <hpa@zytor.com> Sun Jun 25 15:03:47 2006 -0700
tree 0449b3f39ab008677f47b3209f2870dae2df267f
parent 0ba34a10b095d25601dacd540420a97b71278a28
parent f9c47f51adf5a998180ee75344155c6086ea1bd1

Merge with git+ssh://master.kernel.org/pub/scm/libs/klibc/klibc.git

usr/include/assert.h

diff --git a/usr/include/assert.h b/usr/include/assert.h
index ec74037..d89e082 100644
--- a/usr/include/assert.h
+++ b/usr/include/assert.h
@@ -5,13 +5,15 @@
 #ifndef _ASSERT_H
 #define _ASSERT_H
 
+#include <klibc/compiler.h>
+
 #ifdef NDEBUG
 
 #define assert(x) ((void)(x))
 
 #else
 
-extern void __assert_fail(const char *, const char *, unsigned int);
+extern __noreturn __assert_fail(const char *, const char *, unsigned int);
 
 #define assert(x) ((x) ? (void)0 : __assert_fail(#x, __FILE__, __LINE__))
 

usr/klibc/assert.c

diff --git a/usr/klibc/assert.c b/usr/klibc/assert.c
index b922416..cca4129 100644
--- a/usr/klibc/assert.c
+++ b/usr/klibc/assert.c
@@ -5,8 +5,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <assert.h>
+#include <klibc/compiler.h>
 
-void __assert_fail(const char *expr, const char *file, unsigned int line)
+__noreturn __assert_fail(const char *expr, const char *file, unsigned int line)
 {
 	printf("Assertion %s failed, file %s, line %u\n", expr, file, line);
 	abort();