summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Hjelm <hjelmn@google.com>2019-08-14 16:05:10 -0700
committerNathan Hjelm <hjelmn@google.com>2019-08-14 16:15:55 -0700
commitb7ba7ad7e38782aaa04074e3cf064c16f812201c (patch)
tree3114570d0d801b852eeef283ee3b6831adad5f23
parentfd95d445dddc14892fa46538855c5e358efa48da (diff)
downloadlibusb-b7ba7ad7e38782aaa04074e3cf064c16f812201c.tar.gz
windows: fix build
Make code compliant with C89 so it will compile. References #609 Closes #611 Signed-off-by: Nathan Hjelm <hjelmn@google.com>
-rw-r--r--libusb/os/windows_winusb.c6
-rw-r--r--libusb/version_nano.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/libusb/os/windows_winusb.c b/libusb/os/windows_winusb.c
index efef3e6..1b42d4e 100644
--- a/libusb/os/windows_winusb.c
+++ b/libusb/os/windows_winusb.c
@@ -2421,12 +2421,12 @@ static int get_valid_interface(struct libusb_device_handle *dev_handle, int api_
*/
static int check_valid_interface(struct libusb_device_handle *dev_handle, unsigned short interface, int api_id)
{
- if (interface >= USB_MAXINTERFACES)
- return -1;
-
struct winusb_device_handle_priv *handle_priv = _device_handle_priv(dev_handle);
struct winusb_device_priv *priv = _device_priv(dev_handle->dev);
+ if (interface >= USB_MAXINTERFACES)
+ return -1;
+
if ((api_id < USB_API_WINUSBX) || (api_id > USB_API_HID)) {
usbi_dbg("unsupported API ID");
return -1;
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index f957476..fc95dc5 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 11392
+#define LIBUSB_NANO 11393