From f63a34dcc205d9c704eb694e4e9a95ce7d6639bd Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 22 May 2026 07:20:39 +0200 Subject: [PATCH] Try to fix libusb includes --- rpcs3/Emu/Cell/lv2/sys_usbd.cpp | 6 ++---- rpcs3/Emu/Io/usb_device.cpp | 1 - rpcs3/Emu/Io/usb_device.h | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp index d200b6608d..b84e3457cf 100644 --- a/rpcs3/Emu/Cell/lv2/sys_usbd.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_usbd.cpp @@ -44,8 +44,6 @@ #include "Emu/Io/LogitechG27.h" #endif -#include - #ifdef _WIN32 #if LIBUSB_WINDOWS_HOTPLUG && LIBUSB_API_VERSION >= 0x0100010C #define SYS_USBD_HOTPLUG_SUPPORTED 1 @@ -357,7 +355,7 @@ void usb_handler_thread::perform_scan() { // look if any device which we could be interested in is actually connected libusb_device** list = nullptr; - const ssize_t ndev = libusb_get_device_list(ctx, &list); + const auto ndev = libusb_get_device_list(ctx, &list); std::set seen_usb_devices; if (ndev < 0) @@ -366,7 +364,7 @@ void usb_handler_thread::perform_scan() return; } - for (ssize_t index = 0; index < ndev; index++) + for (auto index = 0; index < ndev; index++) { libusb_device* dev = list[index]; libusb_device_descriptor desc; diff --git a/rpcs3/Emu/Io/usb_device.cpp b/rpcs3/Emu/Io/usb_device.cpp index d06af95ce0..dd745e7e46 100644 --- a/rpcs3/Emu/Io/usb_device.cpp +++ b/rpcs3/Emu/Io/usb_device.cpp @@ -4,7 +4,6 @@ #include "Emu/Cell/lv2/sys_usbd.h" #include "Emu/Io/usb_device.h" #include "Utilities/StrUtil.h" -#include LOG_CHANNEL(sys_usbd); diff --git a/rpcs3/Emu/Io/usb_device.h b/rpcs3/Emu/Io/usb_device.h index ff148e7942..2e4818f70c 100644 --- a/rpcs3/Emu/Io/usb_device.h +++ b/rpcs3/Emu/Io/usb_device.h @@ -1,5 +1,7 @@ #pragma once +#include "Emu/Cell/lv2/sys_usbd.h" + #ifdef _MSC_VER #pragma warning(push, 0) #else @@ -15,8 +17,6 @@ #pragma GCC diagnostic pop #endif -#include "Emu/Cell/lv2/sys_usbd.h" - struct UsbTransfer; // Usb descriptors