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

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

diff --git a/source/src/vm/scv/scv.h b/source/src/vm/scv/scv.h
index 059952e..d6a671a 100644 (file)
--- a/source/src/vm/scv/scv.h
+++ b/source/src/vm/scv/scv.h
@@ -27,6 +27,7 @@
 // device informations for win32
 #define USE_CART1
 #define USE_SOUND_VOLUME       2
+#define USE_JOYSTICK
 #define USE_DEBUGGER
 #define USE_JOYSTICK
 #define USE_STATE
@@ -93,7 +94,7 @@ public:
        
        // sound generation
        void initialize_sound(int rate, int samples);
-       uint16* create_sound(int* extra_frames);
+       uint16_t* create_sound(int* extra_frames);
        int get_sound_buffer_ptr();
 #ifdef USE_SOUND_VOLUME
        void set_sound_device_volume(int ch, int decibel_l, int decibel_r);