[VM][General] Merge upstream 2016-03-01. (Pahse 1).

[csp-qt/common_source_project-fm7.git] / source / src / vm / m5 / keyboard.cpp

diff --git a/source/src/vm/m5/keyboard.cpp b/source/src/vm/m5/keyboard.cpp
index e4f812f..40d07a9 100644 (file)
--- a/source/src/vm/m5/keyboard.cpp
+++ b/source/src/vm/m5/keyboard.cpp
@@ -26,9 +26,9 @@ void KEYBOARD::initialize()
        joy_stat = emu->get_joy_buffer();
 }
 
-uint32 KEYBOARD::read_io8(uint32 addr)
+uint32_t KEYBOARD::read_io8(uint32_t addr)
 {
-       uint32 val = 0;
+       uint32_t val = 0;
        
        switch(addr & 0xff) {
        case 0x30: