From 7f76e630c5b26a57f4f937b7673c2c054959b78f Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Wed, 21 Jan 2004 04:43:38 +0000 Subject: [PATCH] rename crash() to sm_crash() to fix conflicting symbols. --- stepmania/src/global.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/global.h b/stepmania/src/global.h index 460c3675b1..a504144251 100644 --- a/stepmania/src/global.h +++ b/stepmania/src/global.h @@ -87,13 +87,13 @@ namespace Checkpoints #endif /* The infinite loop isn't actually reached; it's just there to shut up a warning. */ -static inline void NORETURN crash() { *(char*)0=0; while(1) ; } +static inline void NORETURN sm_crash() { *(char*)0=0; while(1) ; } /* Assertion that sets an optional message and brings up the crash handler, so * we get a backtrace. This should probably be used instead of throwing an * exception in most cases we expect never to happen (but not in cases that * we do expect, such as DSound init failure.) */ -#define FAIL_M(MESSAGE) { CHECKPOINT_M(MESSAGE); crash(); } +#define FAIL_M(MESSAGE) { CHECKPOINT_M(MESSAGE); sm_crash(); } #define ASSERT_M(COND, MESSAGE) { if(!(COND)) { FAIL_M(MESSAGE); } } #define ASSERT(COND) ASSERT_M((COND), "Assertion '" #COND "' failed")