Windows: Fix a cast warning when compiling for x64 in VS
authorPete Batard <pete@akeo.ie>
Tue, 13 Aug 2013 18:00:54 +0000 (19:00 +0100)
committerPete Batard <pete@akeo.ie>
Tue, 13 Aug 2013 18:00:54 +0000 (19:00 +0100)
* Also fixes and closes #129 again

libusb/os/windows_usb.c
libusb/version_nano.h
msvc/libusb_dll_2010.vcxproj.filters

index 097029c..1a9dae1 100644 (file)
@@ -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;
 }
 
 /*
index 074e99d..36b7ee4 100644 (file)
@@ -1 +1 @@
-#define LIBUSB_NANO 10809
+#define LIBUSB_NANO 10810
index cc7d1aa..7a4578c 100644 (file)
@@ -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>