Patchwork [6/9] usb/host-libusb: Fix building with libusb git master code

login
register
mail settings
Submitter Gerd Hoffmann
Date June 24, 2013, 6:44 a.m.
Message ID <1372056283-4845-7-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/253648/
State New
Headers show

Comments

Gerd Hoffmann - June 24, 2013, 6:44 a.m.
From: Hans de Goede <hdegoede@redhat.com>

The next libusb release will deprecate libusb_get_port_path, and since
we compile with -Werror, this breaks the build.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/host-libusb.c |    4 ++++
 1 file changed, 4 insertions(+)

Patch

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 3a582c5..0c12b0f 100644
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -241,7 +241,11 @@  static int usb_host_get_port(libusb_device *dev, char *port, size_t len)
     size_t off;
     int rc, i;
 
+#if LIBUSBX_API_VERSION >= 0x01000102
+    rc = libusb_get_port_numbers(dev, path, 7);
+#else
     rc = libusb_get_port_path(ctx, dev, path, 7);
+#endif
     if (rc < 0) {
         return 0;
     }