Re: [Spice-devel] [spice-gtk v2 2/2] win-usb-dev: remove ifdef for libusb on 1.0.13
On Fri, Feb 22, 2019 at 05:42:22PM +, Victor Toso wrote: > From: Victor Toso > > We already require libusb 1.0.16 or above since 8269a5be62f4ce1 > (build-sys: drop support for libusb < 1.0.16) > > Signed-off-by: Victor Toso > --- > src/win-usb-dev.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/src/win-usb-dev.c b/src/win-usb-dev.c > index 327976d..b614af0 100644 > --- a/src/win-usb-dev.c > +++ b/src/win-usb-dev.c > @@ -570,9 +570,7 @@ static gboolean g_udev_skip_search(GUdevDevice *udev) > g_return_val_if_fail(udevinfo != NULL, FALSE); > > skip = ((udevinfo->addr == 0xff) || /* root hub (HCD) */ > -#if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01FF) > -(udevinfo->addr == 1) || /* root hub addr for libusbx >= 1.0.13 > */ > -#endif > +(udevinfo->addr == 1) || /* root hub addr since libusbx 1.0.13 */ I'd drop "since libusbx 1.0.13" from the comment. Apart from that, series looks good to me. Christophe signature.asc Description: PGP signature ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
[Spice-devel] [spice-gtk v2 2/2] win-usb-dev: remove ifdef for libusb on 1.0.13
From: Victor Toso We already require libusb 1.0.16 or above since 8269a5be62f4ce1 (build-sys: drop support for libusb < 1.0.16) Signed-off-by: Victor Toso --- src/win-usb-dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/win-usb-dev.c b/src/win-usb-dev.c index 327976d..b614af0 100644 --- a/src/win-usb-dev.c +++ b/src/win-usb-dev.c @@ -570,9 +570,7 @@ static gboolean g_udev_skip_search(GUdevDevice *udev) g_return_val_if_fail(udevinfo != NULL, FALSE); skip = ((udevinfo->addr == 0xff) || /* root hub (HCD) */ -#if defined(LIBUSBX_API_VERSION) && (LIBUSBX_API_VERSION >= 0x01FF) -(udevinfo->addr == 1) || /* root hub addr for libusbx >= 1.0.13 */ -#endif +(udevinfo->addr == 1) || /* root hub addr since libusbx 1.0.13 */ (udevinfo->class == LIBUSB_CLASS_HUB) || /* hub*/ (udevinfo->addr == 0)); /* bad address */ return skip; -- 2.20.1 ___ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
