stop including "windows.h" everywhere
make sure sm_crash shows up in stack traces
This commit is contained in:
@@ -1,3 +1,23 @@
|
|||||||
/* This is just a dummy file for Win32 pre-compiled headers. */
|
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
|
|
||||||
|
#ifdef _WINDOWS
|
||||||
|
#include "windows.h"
|
||||||
|
void NORETURN sm_crash()
|
||||||
|
{
|
||||||
|
// throws an exception that gets caught by the exception handler
|
||||||
|
DebugBreak();
|
||||||
|
|
||||||
|
/* Do something after calling DebugBreak, so the call/return isn't optimized
|
||||||
|
* to a jmp; that way, this function will appear in backtrace stack traces. */
|
||||||
|
_asm nop;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
void NORETURN sm_crash()
|
||||||
|
{
|
||||||
|
*(char*)0=0;
|
||||||
|
|
||||||
|
/* This isn't actually reached. We just do this to convince the compiler that the
|
||||||
|
* function really doesn't return. */
|
||||||
|
while(1);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -86,13 +86,7 @@ namespace Checkpoints
|
|||||||
#define NORETURN
|
#define NORETURN
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The infinite loop isn't actually reached; it's just there to shut up a warning. */
|
void NORETURN sm_crash();
|
||||||
#ifdef _WINDOWS
|
|
||||||
#include "windows.h"
|
|
||||||
static inline void NORETURN sm_crash() { DebugBreak(); } // throws an exception that gets caught by the exception handler
|
|
||||||
#else
|
|
||||||
static inline void NORETURN sm_crash() { *(char*)0=0; while(1); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Assertion that sets an optional message and brings up the crash handler, so
|
/* 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
|
* we get a backtrace. This should probably be used instead of throwing an
|
||||||
|
|||||||
Reference in New Issue
Block a user