From fe5d1d2050f715ffa8cbd35a378ac969a1a01584 Mon Sep 17 00:00:00 2001 From: Xiaofan Chen Date: Fri, 30 Jul 2010 15:56:43 +0100 Subject: [PATCH] Fix inconsistencies between prototypes and definitions This removes some warnings on cygwin regarding a name clash against the standard library "index" function. --- libusb/libusb.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libusb/libusb.h b/libusb/libusb.h index 5c88d73..4f91960 100644 --- a/libusb/libusb.h +++ b/libusb/libusb.h @@ -1145,8 +1145,8 @@ static inline unsigned char *libusb_get_iso_packet_buffer_simple( /* sync I/O */ int libusb_control_transfer(libusb_device_handle *dev_handle, - uint8_t request_type, uint8_t request, uint16_t value, uint16_t index, - unsigned char *data, uint16_t length, unsigned int timeout); + uint8_t request_type, uint8_t bRequest, uint16_t wValue, uint16_t wIndex, + unsigned char *data, uint16_t wLength, unsigned int timeout); int libusb_bulk_transfer(libusb_device_handle *dev_handle, unsigned char endpoint, unsigned char *data, int length, @@ -1199,7 +1199,7 @@ static inline int libusb_get_string_descriptor(libusb_device_handle *dev, } int libusb_get_string_descriptor_ascii(libusb_device_handle *dev, - uint8_t index, unsigned char *data, int length); + uint8_t desc_index, unsigned char *data, int length); /* polling and timeouts */ -- 2.7.4