justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[libc] Fix noreturn c++ compatibility

Browse Source 
Stop using bare "noreturn" with library functions, and use the more
cross-compatible "_Noreturn" instead.
This commit is contained in:
Justin C. Miller
2022-02-09 18:49:16 -08:00
parent 4e3ba66b0c
commit 57b2d6dbd8
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libraries/libc/__j6libc/assert_fail.cpp
View File

@@ -1,7 +1,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
noreturn void void
__assert_fail( const char *, const char *, unsigned, const char * ) __assert_fail( const char *, const char *, unsigned, const char * )
{ {
// TODO: display message // TODO: display message

2
src/libraries/libc/assert.h
View File

@@ -20,7 +20,7 @@ extern "C" {
#define assert( argument ) ( (void) 0 ) #define assert( argument ) ( (void) 0 )
#else #else
noreturn void __assert_fail( const char *, const char *, unsigned, const char * ); _Noreturn void __assert_fail( const char *, const char *, unsigned, const char * );
#define assert( argument ) \ #define assert( argument ) \
do { if (!(argument)) { __assert_fail( #argument, __FILE__, __LINE__, __func__ ); }} while(0) do { if (!(argument)) { __assert_fail( #argument, __FILE__, __LINE__, __func__ ); }} while(0)

6
src/libraries/libc/stdnoreturn.h
View File

@@ -10,10 +10,8 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. * file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/ */
#ifdef __cplusplus #if !defined(__cplusplus) && __STDC_VERSION__ >= 201103L
#define noreturn [[noreturn]]
#elif __STDC_VERSION__ >= 201103L
#define noreturn _Noreturn #define noreturn _Noreturn
#else #elif !defined(__cplusplus)
#define noreturn #define noreturn
#endif #endif