summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/emu_window.h4
-rw-r--r--src/core/mem_map.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index 4d09acb8b..6c2b598f6 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -76,9 +76,9 @@ public:
76 76
77protected: 77protected:
78 EmuWindow(): 78 EmuWindow():
79 m_window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc)),
79 m_client_area_width(640), 80 m_client_area_width(640),
80 m_client_area_height(480), 81 m_client_area_height(480)
81 m_window_title(Common::StringFromFormat("Citra | %s-%s", Common::g_scm_branch, Common::g_scm_desc))
82 {} 82 {}
83 virtual ~EmuWindow() {} 83 virtual ~EmuWindow() {}
84 84
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index eed445046..87de5cd63 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -147,6 +147,7 @@ u32 Read16_ZX(VAddr addr);
147void Write8(VAddr addr, u8 data); 147void Write8(VAddr addr, u8 data);
148void Write16(VAddr addr, u16 data); 148void Write16(VAddr addr, u16 data);
149void Write32(VAddr addr, u32 data); 149void Write32(VAddr addr, u32 data);
150void Write64(VAddr addr, u64 data);
150 151
151void WriteBlock(VAddr addr, const u8* data, size_t size); 152void WriteBlock(VAddr addr, const u8* data, size_t size);
152 153