Merge "Fix issue with 32 bit versions of asyncio" am: 71be3d9a6f am: 0500ce7ed2 am: 2347a1f847 (2b934d36) · Commits · e / devices / smdk4412 / android_frameworks_av

media/mtp/AsyncIO.cpp

+4 −2

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

	void splice_read_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,		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));		NULL, aiocbp->aio_nbytes, 0));
	if (aiocbp->ret == -1) aiocbp->error = errno;		if (aiocbp->ret == -1) aiocbp->error = errno;
	}		}

	void splice_write_func(struct aiocb *aiocbp) {		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->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));		aiocbp->aio_nbytes, 0));
	if (aiocbp->ret == -1) aiocbp->error = errno;		if (aiocbp->ret == -1) aiocbp->error = errno;
	}		}