2 files changed, 32 insertions, 0 deletions

diff --git a/emulators/visualboyadvance-m/files/patch-fex_fex_blargg__common.h b/emulators/visualboyadvance-m/files/patch-fex_fex_blargg__common.h
new file mode 100644
index 000000000000..c11d5afd2089
--- /dev/null
+++ b/emulators/visualboyadvance-m/files/patch-fex_fex_blargg__common.h
@@ -0,0 +1,11 @@
+--- fex/fex/blargg_common.h.orig	2019-02-11 08:38:11 UTC
++++ fex/fex/blargg_common.h
+@@ -12,7 +12,7 @@
+ typedef const char* blargg_err_t; // 0 on success, otherwise error string
+ 
+ // Success; no error
+-int const blargg_ok = 0;
++const char* const blargg_ok = 0;
+ 
+ // BLARGG_RESTRICT: equivalent to C99's restrict, where supported
+ #if __GNUC__ >= 3 || _MSC_VER >= 1100
diff --git a/emulators/visualboyadvance-m/files/patch-src_gba_Cheats.cpp b/emulators/visualboyadvance-m/files/patch-src_gba_Cheats.cpp
new file mode 100644
index 000000000000..0708855eec31
--- /dev/null
+++ b/emulators/visualboyadvance-m/files/patch-src_gba_Cheats.cpp
@@ -0,0 +1,21 @@
+--- src/gba/Cheats.cpp.orig	2019-02-11 08:37:58 UTC
++++ src/gba/Cheats.cpp
+@@ -2477,12 +2477,12 @@ void cheatsAddCBACode(const char *code, const char *de
+   sscanf(buffer, "%x", &value);
+ 
+   u8 array[8] = {
+-    address & 255,
+-    (address >> 8) & 255,
+-    (address >> 16) & 255,
+-    (address >> 24) & 255,
+-    (value & 255),
+-    (value >> 8) & 255,
++    static_cast<u8>(address & 255),
++    static_cast<u8>((address >> 8) & 255),
++    static_cast<u8>((address >> 16) & 255),
++    static_cast<u8>((address >> 24) & 255),
++    static_cast<u8>((value & 255)),
++    static_cast<u8>((value >> 8) & 255),
+     0,
+     0
+   };