Fix compiler errors caused by x11 defines and implicit casts

N64Recomp · Dec 31, 2024 · 3966846 · 3966846
1 parent fa1edf9
commit 3966846
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/librecomp/src/mods.cpp b/librecomp/src/mods.cpp
@@ -998,7 +998,7 @@ recomp::mods::CodeModLoadError recomp::mods::ModContext::load_mod_code(uint8_t*
     std::string cur_error_param;
     CodeModLoadError cur_error;
     ModCodeHandleInputs handle_inputs{
-        .base_event_index = num_events,
+        .base_event_index = static_cast<uint32_t>(num_events),
         .recomp_trigger_event = recomp_trigger_event,
         .get_function = get_function,
         .cop0_status_write = cop0_status_write,
@@ -1007,7 +1007,7 @@ recomp::mods::CodeModLoadError recomp::mods::ModContext::load_mod_code(uint8_t*
         .do_break = do_break,
         .reference_section_addresses = section_addresses,
     };
-    
+
     // Allocate the event indices used by the mod.
     num_events += mod.num_events();
 

diff --git a/ultramodern/include/ultramodern/renderer_context.hpp b/ultramodern/include/ultramodern/renderer_context.hpp
@@ -18,6 +18,8 @@
 #   undef LockMask
 #   undef Always
 #   undef Success
+#   undef False
+#   undef True
 #endif
 
 #include "ultra64.h"