mirror of
https://github.com/N64Recomp/N64ModernRuntime.git
synced 2026-05-11 03:12:15 +00:00
Fix compiler errors caused by x11 defines and implicit casts
This commit is contained in:
parent
fa1edf9eaa
commit
3966846e39
2 changed files with 4 additions and 2 deletions
|
|
@ -998,7 +998,7 @@ recomp::mods::CodeModLoadError recomp::mods::ModContext::load_mod_code(uint8_t*
|
||||||
std::string cur_error_param;
|
std::string cur_error_param;
|
||||||
CodeModLoadError cur_error;
|
CodeModLoadError cur_error;
|
||||||
ModCodeHandleInputs handle_inputs{
|
ModCodeHandleInputs handle_inputs{
|
||||||
.base_event_index = num_events,
|
.base_event_index = static_cast<uint32_t>(num_events),
|
||||||
.recomp_trigger_event = recomp_trigger_event,
|
.recomp_trigger_event = recomp_trigger_event,
|
||||||
.get_function = get_function,
|
.get_function = get_function,
|
||||||
.cop0_status_write = cop0_status_write,
|
.cop0_status_write = cop0_status_write,
|
||||||
|
|
|
||||||
|
|
@ -18,6 +18,8 @@
|
||||||
# undef LockMask
|
# undef LockMask
|
||||||
# undef Always
|
# undef Always
|
||||||
# undef Success
|
# undef Success
|
||||||
|
# undef False
|
||||||
|
# undef True
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "ultra64.h"
|
#include "ultra64.h"
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue