diff options
| author | LC <mathew1800@gmail.com> | 2021-01-15 22:19:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 22:19:46 +0100 |
| commit | 8be9e5b48b5d8ef1c52fab16668dd479ac799f00 (patch) | |
| tree | d38b189961f155c6568344ceb631aa82f35c923d /src/core/hle | |
| parent | Merge pull request #5355 from lioncash/timer (diff) | |
| parent | common/common_funcs: Rename INSERT_UNION_PADDING_{BYTES,WORDS} to _NOINIT (diff) | |
| download | yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar.gz yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar.bz2 yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar.lz yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar.xz yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.tar.zst yuzu-8be9e5b48b5d8ef1c52fab16668dd479ac799f00.zip | |
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/ipc.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/am/applets/error.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h index 7ce313190..79bcf5762 100644 --- a/src/core/hle/ipc.h +++ b/src/core/hle/ipc.h @@ -160,7 +160,7 @@ struct DomainMessageHeader { // Used when responding to an IPC request, Server -> Client. struct { u32_le num_objects; - INSERT_UNION_PADDING_WORDS(3); + INSERT_PADDING_WORDS_NOINIT(3); }; // Used when performing an IPC request, Client -> Server. @@ -171,7 +171,7 @@ struct DomainMessageHeader { BitField<16, 16, u32> size; }; u32_le object_id; - INSERT_UNION_PADDING_WORDS(2); + INSERT_PADDING_WORDS_NOINIT(2); }; std::array<u32, 4> raw{}; diff --git a/src/core/hle/service/am/applets/error.cpp b/src/core/hle/service/am/applets/error.cpp index d85505082..0c8b632e8 100644 --- a/src/core/hle/service/am/applets/error.cpp +++ b/src/core/hle/service/am/applets/error.cpp @@ -20,9 +20,9 @@ namespace Service::AM::Applets { struct ShowError { u8 mode; bool jump; - INSERT_UNION_PADDING_BYTES(4); + INSERT_PADDING_BYTES_NOINIT(4); bool use_64bit_error_code; - INSERT_UNION_PADDING_BYTES(1); + INSERT_PADDING_BYTES_NOINIT(1); u64 error_code_64; u32 error_code_32; }; @@ -32,7 +32,7 @@ static_assert(sizeof(ShowError) == 0x14, "ShowError has incorrect size."); struct ShowErrorRecord { u8 mode; bool jump; - INSERT_UNION_PADDING_BYTES(6); + INSERT_PADDING_BYTES_NOINIT(6); u64 error_code_64; u64 posix_time; }; @@ -41,7 +41,7 @@ static_assert(sizeof(ShowErrorRecord) == 0x18, "ShowErrorRecord has incorrect si struct SystemErrorArg { u8 mode; bool jump; - INSERT_UNION_PADDING_BYTES(6); + INSERT_PADDING_BYTES_NOINIT(6); u64 error_code_64; std::array<char, 8> language_code; std::array<char, 0x800> main_text; @@ -52,7 +52,7 @@ static_assert(sizeof(SystemErrorArg) == 0x1018, "SystemErrorArg has incorrect si struct ApplicationErrorArg { u8 mode; bool jump; - INSERT_UNION_PADDING_BYTES(6); + INSERT_PADDING_BYTES_NOINIT(6); u32 error_code; std::array<char, 8> language_code; std::array<char, 0x800> main_text; |