From: Spencer Oliver Date: Mon, 28 Nov 2011 14:56:13 +0000 (+0000) Subject: libusb: Fix build issues under cygwin/mingw X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=3ed7e793c82840d5be88be4c052d3785bd06d870;p=fw%2Fopenocd libusb: Fix build issues under cygwin/mingw This fixes issues with the folliwing patch under cygwin/mingw builds. http://openocd.zylin.com/236 Change-Id: I7dd0b2d09cc64568bc99b16aa32e791a8273c5db Signed-off-by: Spencer Oliver Reviewed-on: http://openocd.zylin.com/240 Tested-by: jenkins Reviewed-by: Mathias Küster Reviewed-by: Mauro Gamba --- diff --git a/src/jtag/drivers/libusb0_common.h b/src/jtag/drivers/libusb0_common.h index 9cf235e37..985d08433 100644 --- a/src/jtag/drivers/libusb0_common.h +++ b/src/jtag/drivers/libusb0_common.h @@ -36,7 +36,7 @@ #define jtag_libusb_reset_device(dev) usb_reset(dev) #define jtag_libusb_get_device(devh) usb_device(devh) -inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh, +static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh, int iface) { return usb_claim_interface(devh, iface); diff --git a/src/jtag/drivers/libusb1_common.h b/src/jtag/drivers/libusb1_common.h index 89e8c1ec5..2cff3f09a 100644 --- a/src/jtag/drivers/libusb1_common.h +++ b/src/jtag/drivers/libusb1_common.h @@ -36,7 +36,7 @@ #define jtag_libusb_reset_device(dev) libusb_reset_device(dev) #define jtag_libusb_get_device(devh) libusb_get_device(devh) -inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh, +static inline int jtag_libusb_claim_interface(jtag_libusb_device_handle *devh, int iface) { return libusb_claim_interface(devh, iface);