diff --git a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp index 7f4456d84a..4332d77a82 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/ConfigDlg.cpp @@ -1541,7 +1541,7 @@ void ConfigDialog::GeneralSettingsChanged(wxCommandEvent& event) DoExtensionConnectedDisconnected(); /* It doesn't seem to be needed but shouldn't it at least take 25 ms to reconnect an extension after we disconnected another? */ - if(g_EmulatorRunning) sleep(25); + if(g_EmulatorRunning) SLEEP(25); } // Update status diff --git a/Source/Plugins/Plugin_Wiimote/Src/main.h b/Source/Plugins/Plugin_Wiimote/Src/main.h index 8d4481e8a2..df7afe86da 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/main.h +++ b/Source/Plugins/Plugin_Wiimote/Src/main.h @@ -18,23 +18,9 @@ #ifndef MAIN_H #define MAIN_H -////////////////////////////////////////////////////////////////////////////////////////// -// Includes -// ŻŻŻŻŻŻŻŻŻŻŻŻŻ #include // System -//////////////////////////////// - -////////////////////////////////////////////////////////////////////////////////////////// // Definitions and declarations -// ŻŻŻŻŻŻŻŻŻ -#ifdef _WIN32 -#define sleep(x) Sleep(x) -#else -#define sleep(x) usleep(x*1000) -#endif - - void DoInitialize(); double GetDoubleTime(); int GetUpdateRate(); @@ -103,7 +89,6 @@ struct SRecordingAll // extern ConfigDialog *frame; //#endif #endif -//////////////////////////////// #endif // MAIN_H diff --git a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp index 8392102cae..f33d397ba4 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp +++ b/Source/Plugins/Plugin_Wiimote/Src/wiimote_real.cpp @@ -321,7 +321,7 @@ void FlashLights(bool Connect) if(Connect) wiiuse_rumble(WiiMoteReal::g_WiiMotesFromWiiUse[i], 1); wiiuse_set_leds(WiiMoteReal::g_WiiMotesFromWiiUse[i], WIIMOTE_LED_1 | WIIMOTE_LED_2 | WIIMOTE_LED_3 | WIIMOTE_LED_4); } - sleep(100); + SLEEP(100); for (int i = 0; i < g_NumberOfWiiMotes; i++) { diff --git a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h index 4bd9d5c49b..6b93015f88 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h +++ b/Source/Plugins/Plugin_nJoy_SDL/Src/nJoy.h @@ -67,15 +67,9 @@ #pragma comment(lib, "winmm.lib") #include void FreeDirectInput(); // Needed in both nJoy.cpp and Rumble.cpp - -#endif // _WIN32 - -#ifdef _WIN32 - #define SLEEP(x) Sleep(x) #else #include #include - #define SLEEP(x) usleep(x*1000) #endif #ifdef __linux__ diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h index a0b27d2bcd..5e6b08b5e2 100644 --- a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h +++ b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.h @@ -60,15 +60,10 @@ #pragma comment(lib, "winmm.lib") #include #endif -#endif // _WIN32 - -#ifdef _WIN32 -#define SLEEP(x) Sleep(x) #else #include #include #include -#define SLEEP(x) usleep(x*1000) #endif #ifdef __linux__