From 0bd6016ad0337f126658583d0a54b347687549d5 Mon Sep 17 00:00:00 2001 From: Jun Su Date: Mon, 23 Mar 2020 16:43:21 +0800 Subject: [PATCH] Wiimote: Cleanup warnings of -Wmissing-variable-declarations While I am here, make g_wiimote_scanner as static as well. --- Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp | 4 ++-- Source/Core/Core/HW/WiimoteReal/WiimoteReal.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp index 595bc5922c..5272d6eba9 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.cpp @@ -69,9 +69,9 @@ struct WiimotePoolEntry // Connected wii remotes are placed here when no open slot is set to "Real". // They are then automatically disconnected after some time. -std::vector g_wiimote_pool; +static std::vector g_wiimote_pool; -WiimoteScanner g_wiimote_scanner; +static WiimoteScanner g_wiimote_scanner; // Attempt to fill a real wiimote slot from the pool or by stealing from ControllerInterface. static void TryToFillWiimoteSlot(u32 index) diff --git a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h index 5b20694ca2..14aa2b9c4d 100644 --- a/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h +++ b/Source/Core/Core/HW/WiimoteReal/WiimoteReal.h @@ -195,7 +195,6 @@ private: // Mutex is recursive as ControllerInterface may call AddWiimoteToPool within ProcessWiimotePool. extern std::recursive_mutex g_wiimotes_mutex; -extern WiimoteScanner g_wiimote_scanner; extern std::unique_ptr g_wiimotes[MAX_BBMOTES]; void AddWiimoteToPool(std::unique_ptr);