From 49a84cbc4c1318b2290688c5e798dcc63c0bf910 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Thu, 2 Feb 2023 14:59:25 -0800 Subject: Resolve various "no previous declaration" warnings --- Source/Core/InputCommon/GCAdapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/GCAdapter.cpp b/Source/Core/InputCommon/GCAdapter.cpp index 1ff134551c..a3853e9e6c 100644 --- a/Source/Core/InputCommon/GCAdapter.cpp +++ b/Source/Core/InputCommon/GCAdapter.cpp @@ -752,7 +752,7 @@ GCPadStatus Input(int chan) } // Get ControllerType from first byte in input payload. -ControllerType IdentifyControllerType(u8 data) +static ControllerType IdentifyControllerType(u8 data) { if (Common::ExtractBit<4>(data)) return ControllerType::Wired; -- cgit v1.2.3 From 7fafb005611bfc285ba5c32de15d92fb66b99e46 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Thu, 2 Feb 2023 15:36:15 -0800 Subject: InputCommon/XInput2: Fix shadowing warning --- Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Source/Core/InputCommon') diff --git a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp index c0594b6662..36371fd368 100644 --- a/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Xlib/XInput2.cpp @@ -151,9 +151,9 @@ void KeyboardMouse::SelectEventsForDevice(XIEventMask* mask, int deviceid) } KeyboardMouse::KeyboardMouse(Window window, int opcode, int pointer, int keyboard, - double scroll_increment) + double scroll_increment_) : m_window(window), xi_opcode(opcode), pointer_deviceid(pointer), keyboard_deviceid(keyboard), - scroll_increment(scroll_increment) + scroll_increment(scroll_increment_) { // The cool thing about each KeyboardMouse object having its own Display // is that each one gets its own separate copy of the X11 event stream, -- cgit v1.2.3