diff options
| author | Xiaofan Chen <xiaofanc@gmail.com> | 2010-07-30 15:56:43 +0100 |
|---|---|---|
| committer | Daniel Drake <dan@reactivated.net> | 2010-08-02 21:24:06 -0600 |
| commit | fe5d1d2050f715ffa8cbd35a378ac969a1a01584 (patch) | |
| tree | 0a1e0dd57c00bf0d759cce6b8ccdcdc13d473639 /libusb/libusb.h | |
| parent | 3b538c43e11b805a37d93b6283d270d5d5f0d1f5 (diff) | |
| download | libusbx-fe5d1d2050f715ffa8cbd35a378ac969a1a01584.tar.gz | |
Fix inconsistencies between prototypes and definitions
This removes some warnings on cygwin regarding a name clash against
the standard library "index" function.
Diffstat (limited to 'libusb/libusb.h')
| -rw-r--r-- | libusb/libusb.h | 6 |
1 files 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 */ |