diff options
Diffstat (limited to 'www/chromium/files/patch-device_usb_usb__service__impl.h')
| -rw-r--r-- | www/chromium/files/patch-device_usb_usb__service__impl.h | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h index f0cced5c3aac..a59648c035d4 100644 --- a/www/chromium/files/patch-device_usb_usb__service__impl.h +++ b/www/chromium/files/patch-device_usb_usb__service__impl.h @@ -1,35 +1,20 @@ ---- device/usb/usb_service_impl.h.orig 2017-06-05 19:03:07 UTC -+++ device/usb/usb_service_impl.h -@@ -15,8 +15,14 @@ - #include "build/build_config.h" - #include "device/usb/usb_context.h" - #include "device/usb/usb_device_impl.h" -+#if defined(OS_FREEBSD) -+#include "libusb.h" -+#define LIBUSB_CALL -+#else - #include "third_party/libusb/src/libusb/libusb.h" -+#endif - -+ - #if defined(OS_WIN) - #include "base/scoped_observer.h" - #include "device/base/device_monitor_win.h" -@@ -73,11 +79,13 @@ class UsbServiceImpl : +--- device/usb/usb_service_impl.h.orig 2018-06-13 00:10:18.000000000 +0200 ++++ device/usb/usb_service_impl.h 2018-07-20 12:47:42.413625000 +0200 +@@ -73,11 +73,13 @@ scoped_refptr<UsbDeviceImpl> device); void RemoveDevice(scoped_refptr<UsbDeviceImpl> device); +#if !defined(OS_FREEBSD) // Handle hotplug events from libusb. static int LIBUSB_CALL HotplugCallback(libusb_context* context, - PlatformUsbDevice device, + libusb_device* device, libusb_hotplug_event event, void* user_data); +#endif // These functions release a reference to the provided platform device. - void OnPlatformDeviceAdded(PlatformUsbDevice platform_device); - void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device); -@@ -94,7 +102,9 @@ class UsbServiceImpl : + void OnPlatformDeviceAdded(ScopedLibusbDeviceRef platform_device); + void OnPlatformDeviceRemoved(ScopedLibusbDeviceRef platform_device); +@@ -95,7 +97,9 @@ // connected instead of only when a full enumeration is requested. // TODO(reillyg): Support this on all platforms. crbug.com/411715 bool hotplug_enabled_ = false; |