svn commit: r418215 - head/emulators/dolphin-emu/files

[Ganael LAPLANCHE]

Author: martymac
Date: Fri Jul  8 10:09:14 2016
New Revision: 418215
URL: https://svnweb.freebsd.org/changeset/ports/418215

Log:
  Fix build on -CURRENT now that LIBUSB_API_VERSION is defined

Modified:
  head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp

Modified: head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp
==============================================================================
--- head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp	Fri Jul  8 10:03:46 2016	(r418214)
+++ head/emulators/dolphin-emu/files/patch-Source-Core-Core-HW-SI_GCAdapter.cpp	Fri Jul  8 10:09:14 2016	(r418215)
@@ -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