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

[csp-qt/common_source_project-fm7.git] / source / src / vm / mz2800 / reset.cpp

diff --git a/source/src/vm/mz2800/reset.cpp b/source/src/vm/mz2800/reset.cpp
index ec536f5..28da017 100644 (file)
--- a/source/src/vm/mz2800/reset.cpp
+++ b/source/src/vm/mz2800/reset.cpp
@@ -14,7 +14,7 @@ void RESET::initialize()
        prev = 0xff;
 }
 
-void RESET::write_signal(int id, uint32 data, uint32 mask)
+void RESET::write_signal(int id, uint32_t data, uint32_t mask)
 {
        // from i8255 port c
        if(!(prev & 2) && (data & 2)) {