Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0500ce7e authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Fix issue with 32 bit versions of asyncio" 

am: 71be3d9a

Change-Id: I6d0bb90c36b47ccc8d50c3b38c910ab9943cc69f
parents f1d93381 71be3d9a

media/mtp/AsyncIO.cpp

+4 −2
Original line number Diff line number Diff line
@@ -37,15 +37,17 @@ void write_func(struct aiocb *aiocbp) { 
}



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;

}