diff options
| author | Pete Batard <pete@akeo.ie> | 2013-08-13 19:00:54 +0100 |
|---|---|---|
| committer | Pete Batard <pete@akeo.ie> | 2013-08-13 19:00:54 +0100 |
| commit | 368d613a17a3d768a7f434b886a8299f13711f8d (patch) | |
| tree | 1b42f2beff99c91431196b60a40d9e79327ec634 | |
| parent | d28ab4bf13eb101f35d3543a3b2c2ca51a98e19d (diff) | |
| download | libusb-368d613a17a3d768a7f434b886a8299f13711f8d.tar.gz | |
Windows: Fix a cast warning when compiling for x64 in VS
* Also fixes and closes #129 again
| -rw-r--r-- | libusb/os/windows_usb.c | 2 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 | ||||
| -rw-r--r-- | msvc/libusb_dll_2010.vcxproj.filters | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index 097029c..1a9dae1 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -1765,7 +1765,7 @@ static int windows_get_config_descriptor(struct libusb_device *dev, uint8_t conf memcpy(buffer, priv->config_descriptor[config_index], size); *host_endian = 0; - return size; + return (int)size; } /* diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 074e99d..36b7ee4 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10809 +#define LIBUSB_NANO 10810 diff --git a/msvc/libusb_dll_2010.vcxproj.filters b/msvc/libusb_dll_2010.vcxproj.filters index cc7d1aa..7a4578c 100644 --- a/msvc/libusb_dll_2010.vcxproj.filters +++ b/msvc/libusb_dll_2010.vcxproj.filters @@ -46,9 +46,9 @@ <ClInclude Include=".\config.h"> <Filter>Header Files</Filter> </ClInclude> - <ClCompile Include="..\libusb\hotplug.h"> + <ClInclude Include="..\libusb\hotplug.h"> <Filter>Header Files</Filter> - </ClCompile> + </ClInclude> <ClInclude Include="..\libusb\libusb.h"> <Filter>Header Files</Filter> </ClInclude> |