summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-01-15 08:25:40 +0100
committerReinUsesLisp <reinuseslisp@airmail.cc>2021-01-15 20:27:28 +0100
commit3ff978aa4f6b9d46179e41c36825eb06e7f8d60c (patch)
treeb785496e5fb574c0df48ebba7d8a518eb9adde21 /src/core/hle
parentMerge pull request #5354 from ReinUsesLisp/remove-common-color (diff)
downloadyuzu-3ff978aa4f6b9d46179e41c36825eb06e7f8d60c.tar
yuzu-3ff978aa4f6b9d46179e41c36825eb06e7f8d60c.tar.gz
yuzu-3ff978aa4f6b9d46179e41c36825eb06e7f8d60c.tar.bz2
yuzu-3ff978aa4f6b9d46179e41c36825eb06e7f8d60c.tar.lz
yuzu-3ff978aa4f6b9d46179e41c36825eb06e7f8d60c.tar.xz
yuzu-3ff978aa4f6b9d46179e41c36825eb06e7f8d60c.tar.zst
yuzu-3ff978aa4f6b9d46179e41c36825eb06e7f8d60c.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/ipc.h4
-rw-r--r--src/core/hle/service/am/applets/error.cpp10
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;