From 3ffe06a5e994c77430cf7152a28a00690eb382d9 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Thu, 3 Mar 2016 19:12:43 +0900 Subject: [PATCH] [Qt][Joystick][VM][MZ1500][MZ700][MZ800] Fix FTBFSs. --- source/src/qt/common/joy_thread.cpp | 3 ++- source/src/qt/common/joy_thread.h | 3 +-- source/src/qt/osd_socket.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source/src/qt/common/joy_thread.cpp b/source/src/qt/common/joy_thread.cpp index 925339d7e..2bae112c5 100644 --- a/source/src/qt/common/joy_thread.cpp +++ b/source/src/qt/common/joy_thread.cpp @@ -21,12 +21,13 @@ #include "joy_thread.h" + JoyThreadClass::JoyThreadClass(EMU *p, QObject *parent) : QThread(parent) { int i, j; int n; p_emu = p; -#if defined(USE_JOYSTICK) +#if defined(USE_JOYSTICK) # if defined(USE_SDL2) for(i = 0; i < 16; i++) { controller_table[i] = NULL; diff --git a/source/src/qt/common/joy_thread.h b/source/src/qt/common/joy_thread.h index adde086fd..cbc972916 100644 --- a/source/src/qt/common/joy_thread.h +++ b/source/src/qt/common/joy_thread.h @@ -19,7 +19,6 @@ class EMU; class QString; QT_BEGIN_NAMESPACE -#if defined(USE_JOYSTICK) class JoyThreadClass : public QThread { Q_OBJECT @@ -62,7 +61,7 @@ public slots: int sig_finished(void); int call_joy_thread(EMU *); }; -#endif + QT_END_NAMESPACE diff --git a/source/src/qt/osd_socket.cpp b/source/src/qt/osd_socket.cpp index 2bb9d796f..d00a7d6b8 100644 --- a/source/src/qt/osd_socket.cpp +++ b/source/src/qt/osd_socket.cpp @@ -46,8 +46,8 @@ void OSD::update_socket() if(recv_r_ptr[i] < recv_w_ptr[i]) { // get buffer int size0, size1; - uint8* buf0 = vm->get_socket_recv_buffer0(i, &size0, &size1); - uint8* buf1 = vm->get_socket_recv_buffer1(i); + uint8_t* buf0 = vm->get_socket_recv_buffer0(i, &size0, &size1); + uint8_t* buf1 = vm->get_socket_recv_buffer1(i); int size = recv_w_ptr[i] - recv_r_ptr[i]; if(size > size0 + size1) { @@ -88,7 +88,7 @@ bool OSD::initialize_socket_udp(int ch) return false; } -bool OSD::connect_socket(int ch, uint32 ipaddr, int port) +bool OSD::connect_socket(int ch, uint32_t ipaddr, int port) { return true; } @@ -108,7 +108,7 @@ void OSD::send_socket_data_tcp(int ch) { } -void OSD::send_socket_data_udp(int ch, uint32 ipaddr, int port) +void OSD::send_socket_data_udp(int ch, uint32_t ipaddr, int port) { } -- 2.11.0