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

Commit 2347a1f8 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 

am: 0500ce7e

Change-Id: Ic8771054afb8c81f7ded84f9aa5b42af0356f167
parents 6896c4af 0500ce7e

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;

}