summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-11-13 12:50:49 +0100
committerLioncash <mathew1800@gmail.com>2019-11-13 12:53:19 +0100
commit61f6eaad451652e779bb056786c1d6650d1fd7f5 (patch)
treed45f94bdfb97abfdf84819b611a4564e432b48f6 /src
parentMerge pull request #3085 from bunnei/web-token-b64 (diff)
downloadyuzu-61f6eaad451652e779bb056786c1d6650d1fd7f5.tar
yuzu-61f6eaad451652e779bb056786c1d6650d1fd7f5.tar.gz
yuzu-61f6eaad451652e779bb056786c1d6650d1fd7f5.tar.bz2
yuzu-61f6eaad451652e779bb056786c1d6650d1fd7f5.tar.lz
yuzu-61f6eaad451652e779bb056786c1d6650d1fd7f5.tar.xz
yuzu-61f6eaad451652e779bb056786c1d6650d1fd7f5.tar.zst
yuzu-61f6eaad451652e779bb056786c1d6650d1fd7f5.zip
Diffstat (limited to 'src')
-rw-r--r--src/common/common_funcs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h
index c029dc7b3..6dc3e108f 100644
--- a/src/common/common_funcs.h
+++ b/src/common/common_funcs.h
@@ -56,7 +56,7 @@ std::string GetLastErrorMsg();
namespace Common {
constexpr u32 MakeMagic(char a, char b, char c, char d) {
- return a | b << 8 | c << 16 | d << 24;
+ return u32(a) | u32(b) << 8 | u32(c) << 16 | u32(d) << 24;
}
} // namespace Common