mirror of
https://github.com/N64Recomp/N64ModernRuntime.git
synced 2026-02-07 14:16:38 +00:00
Fix x11 header issue and unsequenced warning
This commit is contained in:
parent
a2688d2558
commit
ae5e92303f
2 changed files with 12 additions and 4 deletions
|
|
@ -13,6 +13,9 @@
|
|||
|
||||
#include "recomp.h"
|
||||
|
||||
// Remove X11 define
|
||||
#undef Bool
|
||||
|
||||
namespace recomp {
|
||||
namespace config {
|
||||
|
||||
|
|
|
|||
|
|
@ -40,11 +40,16 @@ bool read_u32(std::span<const uint8_t> patch_data, size_t& offset, uint32_t& num
|
|||
return false;
|
||||
}
|
||||
|
||||
uint8_t byte0 = patch_data[offset++];
|
||||
uint8_t byte1 = patch_data[offset++];
|
||||
uint8_t byte2 = patch_data[offset++];
|
||||
uint8_t byte3 = patch_data[offset++];
|
||||
|
||||
number_out =
|
||||
(uint32_t(patch_data[offset++]) << 0) |
|
||||
(uint32_t(patch_data[offset++]) << 8) |
|
||||
(uint32_t(patch_data[offset++]) << 16) |
|
||||
(uint32_t(patch_data[offset++]) << 24);
|
||||
(uint32_t(byte0) << 0) |
|
||||
(uint32_t(byte1) << 8) |
|
||||
(uint32_t(byte2) << 16) |
|
||||
(uint32_t(byte3) << 24);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue