diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-10-14 02:39:30 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-10-14 02:39:37 -0400 |
| commit | 6f2d785d0ff761961912d7e79a7d16c4adf86861 (patch) | |
| tree | 3b96b197cc58b3a4bd30663cb66cf2aca630e77d /src/debug.h | |
| parent | 6f4d6cb5741d10e10dacc78e264e421bf6a297cf (diff) | |
| download | minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.gz minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.tar.bz2 minetest-6f2d785d0ff761961912d7e79a7d16c4adf86861.zip | |
Rename macros with two leading underscores
These names are reserved for the compiler/library implementations.
Diffstat (limited to 'src/debug.h')
| -rw-r--r-- | src/debug.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/debug.h b/src/debug.h index e8d35ba70..2098942db 100644 --- a/src/debug.h +++ b/src/debug.h @@ -35,13 +35,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifdef _MSC_VER #include <eh.h> #endif - #define __NORETURN __declspec(noreturn) - #define __FUNCTION_NAME __FUNCTION__ #define NORETURN __declspec(noreturn) #define FUNCTION_NAME __FUNCTION__ #else - #define __NORETURN __attribute__ ((__noreturn__)) - #define __FUNCTION_NAME __PRETTY_FUNCTION__ #define NORETURN __attribute__ ((__noreturn__)) #define FUNCTION_NAME __PRETTY_FUNCTION__ #endif @@ -57,16 +53,16 @@ with this program; if not, write to the Free Software Foundation, Inc., /* Abort program execution immediately */ -__NORETURN extern void fatal_error_fn( +NORETURN extern void fatal_error_fn( const char *msg, const char *file, unsigned int line, const char *function); #define FATAL_ERROR(msg) \ - fatal_error_fn((msg), __FILE__, __LINE__, __FUNCTION_NAME) + fatal_error_fn((msg), __FILE__, __LINE__, FUNCTION_NAME) #define FATAL_ERROR_IF(expr, msg) \ ((expr) \ - ? fatal_error_fn((msg), __FILE__, __LINE__, __FUNCTION_NAME) \ + ? fatal_error_fn((msg), __FILE__, __LINE__, FUNCTION_NAME) \ : (void)(0)) /* @@ -75,14 +71,14 @@ __NORETURN extern void fatal_error_fn( defined) */ -__NORETURN extern void sanity_check_fn( +NORETURN extern void sanity_check_fn( const char *assertion, const char *file, unsigned int line, const char *function); #define SANITY_CHECK(expr) \ ((expr) \ ? (void)(0) \ - : sanity_check_fn(#expr, __FILE__, __LINE__, __FUNCTION_NAME)) + : sanity_check_fn(#expr, __FILE__, __LINE__, FUNCTION_NAME)) #define sanity_check(expr) SANITY_CHECK(expr) |