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

[csp-qt/common_source_project-fm7.git] / source / src / vm / phc25 / joystick.h

diff --git a/source/src/vm/phc25/joystick.h b/source/src/vm/phc25/joystick.h
index 90575ef..2984cd3 100644 (file)
--- a/source/src/vm/phc25/joystick.h
+++ b/source/src/vm/phc25/joystick.h
@@ -19,7 +19,7 @@ class JOYSTICK : public DEVICE
 {
 private:
        DEVICE *d_psg;
-       const uint32 *joy_stat;
+       const uint32_t *joy_stat;
        
 public:
        JOYSTICK(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu) {}