diff options
| author | Simonx22 <simon@oatmealdome.me> | 2026-07-12 10:17:29 -0400 |
|---|---|---|
| committer | Simonx22 <simon@oatmealdome.me> | 2026-07-12 10:17:39 -0400 |
| commit | aeb3fec03aa31fbd14420c10653b27999feffc7d (patch) | |
| tree | 0088a7a75a00324f52cda337814ec2f38133dd86 /Source/Core | |
| parent | 6de526c684ee6dd8b6fc3447dae858ae480ccbb5 (diff) | |
Android: Update dependencies and build tools
Update Android dependencies and build tools to their latest available versions.
Rename the GameCube save magic constant to avoid a collision with the NDK 30 ARM64 signal context header.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp b/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp index c7e0aa06a8..7d097d61e1 100644 --- a/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp +++ b/Source/Core/Core/HW/GCMemcard/GCMemcardUtils.cpp @@ -21,7 +21,7 @@ constexpr std::array<u8, 12> SAV_MAGIC = {0x44, 0x41, 0x54, 0x45, 0x4C, 0x47, 0x43, 0x5F, 0x53, 0x41, 0x56, 0x45}; // "DATELGC_SAVE" constexpr u32 SAV_HEADER_SIZE = 0xC0; constexpr u32 SAV_DENTRY_OFFSET = 0x80; -constexpr std::array<u8, 6> GCS_MAGIC = {0x47, 0x43, 0x53, 0x41, 0x56, 0x45}; // "GCSAVE" +constexpr std::array<u8, 6> GCS_FILE_MAGIC = {0x47, 0x43, 0x53, 0x41, 0x56, 0x45}; // "GCSAVE" constexpr u32 GCS_HEADER_SIZE = 0x150; constexpr u32 GCS_DENTRY_OFFSET = 0x110; @@ -153,7 +153,7 @@ static std::variant<ReadSavefileErrorCode, Savefile> ReadSavefileInternalGCS(Fil if (!file.ReadBytes(gcs_header.data(), gcs_header.size())) return ReadSavefileErrorCode::IOError; - if (std::memcmp(gcs_header.data(), GCS_MAGIC.data(), GCS_MAGIC.size()) != 0) + if (std::memcmp(gcs_header.data(), GCS_FILE_MAGIC.data(), GCS_FILE_MAGIC.size()) != 0) return ReadSavefileErrorCode::DataCorrupted; Savefile savefile; @@ -245,7 +245,7 @@ static bool WriteSavefileInternalGCS(File::IOFile& file, const Savefile& savefil { std::array<u8, GCS_HEADER_SIZE> header; std::memset(header.data(), 0, header.size()); - std::memcpy(header.data(), GCS_MAGIC.data(), GCS_MAGIC.size()); + std::memcpy(header.data(), GCS_FILE_MAGIC.data(), GCS_FILE_MAGIC.size()); DEntry gcs_entry = savefile.dir_entry; gcs_entry.m_block_count = 1; // always stored as 1 in GCS files |