From c50f7962c823506109b6307209411b36e0d46abd Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Fri, 1 Nov 2013 17:48:35 +0000 Subject: [sanitizer] Switch to an older version of struct iocb that is found in the latest Android NDK. They are binary compatible, and we don't use any of the new fields anyway. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@193870 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/sanitizer_common/sanitizer_platform_limits_linux.cc | 2 -- lib/sanitizer_common/sanitizer_platform_limits_posix.h | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/sanitizer_common/sanitizer_platform_limits_linux.cc b/lib/sanitizer_common/sanitizer_platform_limits_linux.cc index 6efad7675..708a15185 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_linux.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_linux.cc @@ -68,7 +68,5 @@ CHECK_SIZE_AND_OFFSET(iocb, aio_fildes); CHECK_SIZE_AND_OFFSET(iocb, aio_buf); CHECK_SIZE_AND_OFFSET(iocb, aio_nbytes); CHECK_SIZE_AND_OFFSET(iocb, aio_offset); -CHECK_SIZE_AND_OFFSET(iocb, aio_flags); -CHECK_SIZE_AND_OFFSET(iocb, aio_resfd); #endif // SANITIZER_LINUX diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h index 2da0f7f84..42b317b16 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -82,8 +82,7 @@ namespace __sanitizer { u64 aio_nbytes; s64 aio_offset; u64 aio_reserved2; - u32 aio_flags; - u32 aio_resfd; + u64 aio_reserved3; }; extern unsigned iocb_cmd_pread; -- cgit v1.2.1