summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-09-01 20:08:21 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-09-14 22:39:50 +0200
commit6c89d4ca26025519355ac9c6b6ddb08791621d11 (patch)
tree73c7492285e3bf0578b08fd54ae0ce55c88aac95
parentService/CFG: Move several private types from the header to the cpp (diff)
downloadyuzu-6c89d4ca26025519355ac9c6b6ddb08791621d11.tar
yuzu-6c89d4ca26025519355ac9c6b6ddb08791621d11.tar.gz
yuzu-6c89d4ca26025519355ac9c6b6ddb08791621d11.tar.bz2
yuzu-6c89d4ca26025519355ac9c6b6ddb08791621d11.tar.lz
yuzu-6c89d4ca26025519355ac9c6b6ddb08791621d11.tar.xz
yuzu-6c89d4ca26025519355ac9c6b6ddb08791621d11.tar.zst
yuzu-6c89d4ca26025519355ac9c6b6ddb08791621d11.zip
-rw-r--r--src/core/hle/service/cfg/cfg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h
index c4155da81..7b7a76b08 100644
--- a/src/core/hle/service/cfg/cfg.h
+++ b/src/core/hle/service/cfg/cfg.h
@@ -42,7 +42,7 @@ struct SaveConfigBlockEntry {
};
// TODO(Link Mauve): use a constexpr once MSVC starts supporting it.
-#define C(code) ((code)[0] | ((code)[1] << 8))
+#define C(code) (u16)((code)[0] | ((code)[1] << 8))
static const std::array<u16, 187> country_codes = {
0, C("JP"), 0, 0, 0, 0, 0, 0, // 0-7