commit 2b934d36939c571a47cc972670176bc0356c54be
author Jerry Zhang <zhangjerry@google.com> Thu Jan 05 00:20:41 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 05 00:20:41 2017 +0000
tree 2e73c55885322bfa6c2120a6a708ed2271ae68bd
parent 3cc1da3dc8f367d8a29251088945d67fede8bfb8
parent 8706043acc858d6191169912e40c7b7df7209c24

Merge "Fix issue with 32 bit versions of asyncio" am: 71be3d9a6f am: 0500ce7ed2 am: 2347a1f847
am: 8706043acc

Change-Id: I779cf3078e76ee7e4245d41fe935309958829205

media/mtp/AsyncIO.cpp

diff --git a/media/mtp/AsyncIO.cpp b/media/mtp/AsyncIO.cpp
index a1a98ab..e77ad38 100644
--- a/media/mtp/AsyncIO.cpp
+++ b/media/mtp/AsyncIO.cpp
@@ -37,15 +37,17 @@
 }
 
 void splice_read_func(struct aiocb *aiocbp) {
+    loff_t long_offset = aiocbp->aio_offset;
     aiocbp->ret = TEMP_FAILURE_RETRY(splice(aiocbp->aio_fildes,
-                (off64_t*) &aiocbp->aio_offset, aiocbp->aio_sink,
+                &long_offset, aiocbp->aio_sink,
                 NULL, aiocbp->aio_nbytes, 0));
     if (aiocbp->ret == -1) aiocbp->error = errno;
 }
 
 void splice_write_func(struct aiocb *aiocbp) {
+    loff_t long_offset = aiocbp->aio_offset;
     aiocbp->ret = TEMP_FAILURE_RETRY(splice(aiocbp->aio_fildes, NULL,
-                aiocbp->aio_sink, (off64_t*) &aiocbp->aio_offset,
+                aiocbp->aio_sink, &long_offset,
                 aiocbp->aio_nbytes, 0));
     if (aiocbp->ret == -1) aiocbp->error = errno;
 }