diff options
| author | martymac <martymac@FreeBSD.org> | 2016-07-08 18:09:14 +0800 |
|---|---|---|
| committer | martymac <martymac@FreeBSD.org> | 2016-07-08 18:09:14 +0800 |
| commit | 400dbe87eb3cacb23d81e818e2f5d2afdc5d0064 (patch) | |
| tree | 35ebb59cf034b1da247dc7b7645b4d2a99fd2f62 | |
| parent | e9d54d08c2761b7d51b9e63cf6f51e0331394282 (diff) | |
| download | freebsd-ports-gnome-400dbe87eb3cacb23d81e818e2f5d2afdc5d0064.tar.gz freebsd-ports-gnome-400dbe87eb3cacb23d81e818e2f5d2afdc5d0064.tar.zst freebsd-ports-gnome-400dbe87eb3cacb23d81e818e2f5d2afdc5d0064.zip | |
Fix build on -CURRENT now that LIBUSB_API_VERSION is defined
| -rw-r--r-- | emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp b/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp index f9d3fe016af3..b3519594b746 100644 --- a/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp +++ b/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp @@ -6,7 +6,7 @@ Disable hotplug support for FreeBSD static bool s_libusb_driver_not_supported = false; static libusb_context* s_libusb_context = nullptr; static bool s_libusb_hotplug_enabled = false; -+#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 ++#if !defined(__FreeBSD__) && defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 static libusb_hotplug_callback_handle s_hotplug_handle; +#endif @@ -16,7 +16,7 @@ Disable hotplug support for FreeBSD } } -+#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 ++#if !defined(__FreeBSD__) && defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 static int HotplugCallback(libusb_context* ctx, libusb_device* dev, libusb_hotplug_event event, void* user_data) { if (event == LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED) @@ -31,7 +31,7 @@ Disable hotplug support for FreeBSD Common::SetCurrentThreadName("GC Adapter Scanning Thread"); NOTICE_LOG(SERIALINTERFACE, "GC Adapter scanning thread started"); -+#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 ++#if !defined(__FreeBSD__) && defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 s_libusb_hotplug_enabled = libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG) != 0; if (s_libusb_hotplug_enabled) { @@ -47,7 +47,7 @@ Disable hotplug support for FreeBSD void Shutdown() { StopScanThread(); -+#if defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 ++#if !defined(__FreeBSD__) && defined(LIBUSB_API_VERSION) && LIBUSB_API_VERSION >= 0x01000102 if (s_libusb_hotplug_enabled) libusb_hotplug_deregister_callback(s_libusb_context, s_hotplug_handle); +#endif |