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

[csp-qt/common_source_project-fm7.git] / source / src / vm / j3100 / slsystem.cpp

diff --git a/source/src/vm/j3100/slsystem.cpp b/source/src/vm/j3100/slsystem.cpp
index eaa2df6..6e3fc7f 100644 (file)
--- a/source/src/vm/j3100/slsystem.cpp
+++ b/source/src/vm/j3100/slsystem.cpp
@@ -25,7 +25,7 @@ ea    out     byte    5a
 eb     out     byte    e0
 */
 
-void SYSTEM::write_io8(uint32 addr, uint32 data)
+void SYSTEM::write_io8(uint32_t addr, uint32_t data)
 {
        switch(addr & 0xffff) {
        case 0xa0:
@@ -34,7 +34,7 @@ void SYSTEM::write_io8(uint32 addr, uint32 data)
        }
 }
 
-uint32 SYSTEM::read_io8(uint32 addr)
+uint32_t SYSTEM::read_io8(uint32_t addr)
 {
        return 0xff;
 }