diff options
| author | 2015-01-20 17:16:47 -0800 | |
|---|---|---|
| committer | 2015-02-10 18:30:31 -0800 | |
| commit | ef24e72b2618806f64345544fa46c84f3f494890 (patch) | |
| tree | fca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/common/msg_handler.h | |
| parent | GSP: Fixed typo in SignalInterrupt (diff) | |
| download | yuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.gz yuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.xz yuzu-ef24e72b2618806f64345544fa46c84f3f494890.zip | |
Asserts: break/crash program, fit to style guide; log.h->assert.h
Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time)
As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing)
Also removed some GEKKO cruft.
Diffstat (limited to 'src/common/msg_handler.h')
| -rw-r--r-- | src/common/msg_handler.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/common/msg_handler.h b/src/common/msg_handler.h index 5a483ddb4..421f93e23 100644 --- a/src/common/msg_handler.h +++ b/src/common/msg_handler.h | |||
| @@ -29,7 +29,6 @@ extern bool MsgAlert(bool yes_no, int Style, const char* format, ...) | |||
| 29 | ; | 29 | ; |
| 30 | void SetEnableAlert(bool enable); | 30 | void SetEnableAlert(bool enable); |
| 31 | 31 | ||
| 32 | #ifndef GEKKO | ||
| 33 | #ifdef _MSC_VER | 32 | #ifdef _MSC_VER |
| 34 | #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) | 33 | #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) |
| 35 | #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) | 34 | #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) |
| @@ -55,16 +54,3 @@ void SetEnableAlert(bool enable); | |||
| 55 | #define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) | 54 | #define AskYesNoT(format, ...) MsgAlert(true, QUESTION, format, ##__VA_ARGS__) |
| 56 | #define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) | 55 | #define CriticalAlertT(format, ...) MsgAlert(false, CRITICAL, format, ##__VA_ARGS__) |
| 57 | #endif | 56 | #endif |
| 58 | #else | ||
| 59 | // GEKKO | ||
| 60 | #define SuccessAlert(format, ...) ; | ||
| 61 | #define PanicAlert(format, ...) ; | ||
| 62 | #define PanicYesNo(format, ...) ; | ||
| 63 | #define AskYesNo(format, ...) ; | ||
| 64 | #define CriticalAlert(format, ...) ; | ||
| 65 | #define SuccessAlertT(format, ...) ; | ||
| 66 | #define PanicAlertT(format, ...) ; | ||
| 67 | #define PanicYesNoT(format, ...) ; | ||
| 68 | #define AskYesNoT(format, ...) ; | ||
| 69 | #define CriticalAlertT(format, ...) ; | ||
| 70 | #endif | ||