darwin: Fix build break and warning caused by commit 699db154
authorChris Dickens <christopher.a.dickens@gmail.com>
Sun, 1 Feb 2015 06:25:24 +0000 (22:25 -0800)
committerChris Dickens <christopher.a.dickens@gmail.com>
Sun, 1 Feb 2015 06:25:24 +0000 (22:25 -0800)
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
libusb/os/darwin_usb.c
libusb/version_nano.h

index 43d03cd..e181ba8 100644 (file)
@@ -1746,7 +1746,6 @@ static void darwin_clear_transfer_priv (struct usbi_transfer *itransfer) {
 static void darwin_async_io_callback (void *refcon, IOReturn result, void *arg0) {
   struct usbi_transfer *itransfer = (struct usbi_transfer *)refcon;
   struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
-  struct darwin_device_handle_priv *priv = (struct darwin_device_handle_priv *)transfer->dev_handle->os_priv;
   struct darwin_transfer_priv *tpriv = usbi_transfer_get_os_priv(itransfer);
 
   usbi_dbg ("an async io operation has completed");
@@ -1821,7 +1820,7 @@ static int darwin_handle_transfer_completion (struct usbi_transfer *itransfer) {
         lib_desc->actual_length = tpriv->isoc_framelist[i].frActCount;
       }
     } else if (!isIsoc)
-      itransfer->transferred += tpriv->io_size;
+      itransfer->transferred += tpriv->size;
   }
 
   /* it is ok to handle cancelled transfers without calling usbi_handle_transfer_cancellation (we catch timeout transfers) */
index 7ffa1dd..bafad24 100644 (file)
@@ -1 +1 @@
-#define LIBUSB_NANO 10958
+#define LIBUSB_NANO 10959