diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2015-01-31 22:25:24 -0800 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2015-01-31 22:25:24 -0800 |
| commit | d68750a7ac65e29b41cadacd4231cc68af8a79bd (patch) | |
| tree | e6f592e39c7bb8cdd3e3ce17c695cfd6fad149c6 | |
| parent | cbbed3c2211406237274d8daf740fa7e6a1c2669 (diff) | |
| download | libusb-d68750a7ac65e29b41cadacd4231cc68af8a79bd.tar.gz | |
darwin: Fix build break and warning caused by commit 699db154
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
| -rw-r--r-- | libusb/os/darwin_usb.c | 3 | ||||
| -rw-r--r-- | libusb/version_nano.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libusb/os/darwin_usb.c b/libusb/os/darwin_usb.c index 43d03cd..e181ba8 100644 --- a/libusb/os/darwin_usb.c +++ b/libusb/os/darwin_usb.c @@ -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) */ diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 7ffa1dd..bafad24 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 10958 +#define LIBUSB_NANO 10959 |