diff options
| author | Ludovic Rousseau <ludovic.rousseau@gmail.com> | 2013-02-16 17:07:53 +0100 |
|---|---|---|
| committer | Ludovic Rousseau <ludovic.rousseau+github@gmail.com> | 2013-02-18 18:30:38 +0100 |
| commit | 4eed8c694fe52e9610392356b228edd095a519d7 (patch) | |
| tree | a24aaf6117ddd7ebb96cd411a04021786d599929 | |
| parent | 9a19cb92f51fba9ff771351d3ac26692af380da7 (diff) | |
| download | libusb-4eed8c694fe52e9610392356b228edd095a519d7.tar.gz | |
Windows: fix compiler warnings
libusb/os/windows_usb.c:1317:2: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
libusb/os/windows_usb.c:1317:2: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
libusb/os/windows_usb.c:1317:2: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
libusb/os/windows_usb.c:3634:2: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
libusb/os/windows_usb.c:3634:2: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
libusb/os/windows_usb.c:3634:2: warning: initialization discards 'const' qualifier from pointer target type [enabled by default]
| -rw-r--r-- | libusb/os/windows_usb.c | 6 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index f104ded..3dff01e 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -259,7 +259,7 @@ static int init_dlls(void) * incremented index starting at zero) until all interfaces have been returned. */ static bool get_devinfo_data(struct libusb_context *ctx, - HDEVINFO *dev_info, SP_DEVINFO_DATA *dev_info_data, char* usb_class, unsigned _index) + HDEVINFO *dev_info, SP_DEVINFO_DATA *dev_info_data, const char* usb_class, unsigned _index) { if (_index <= 0) { *dev_info = pSetupDiGetClassDevsA(NULL, usb_class, NULL, DIGCF_PRESENT|DIGCF_ALLCLASSES); @@ -1314,7 +1314,7 @@ static int windows_get_device_list(struct libusb_context *ctx, struct discovered { struct discovered_devs *discdevs; HDEVINFO dev_info = { 0 }; - char* usb_class[] = {"USB", "NUSB3", "IUSB3"}; + const char* usb_class[] = {"USB", "NUSB3", "IUSB3"}; SP_DEVINFO_DATA dev_info_data = { 0 }; SP_DEVICE_INTERFACE_DETAIL_DATA_A *dev_interface_details = NULL; GUID hid_guid; @@ -3631,7 +3631,7 @@ static int hid_open(int sub_api, struct libusb_device_handle *dev_handle) int i, j; // report IDs handling ULONG size[3]; - char* type[3] = {"input", "output", "feature"}; + const char* type[3] = {"input", "output", "feature"}; int nb_ids[2]; // zero and nonzero report IDs CHECK_HID_AVAILABLE; diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 43e2c45..bb065fd 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10611 +#define LIBUSB_NANO 10612 |