diff options
| author | Dan Albert <danalbert@google.com> | 2014-06-05 02:00:24 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-06-05 02:00:24 +0000 |
| commit | fa02459c5a070d03bd762890180f0526d13ad125 (patch) | |
| tree | e24cc559782f6a53253e219fc73e7e6bcc0b7276 /lib/sanitizer_common/sanitizer_platform_limits_posix.cc | |
| parent | 75fc508ec743709a99c161539cb037244e2f8a8f (diff) | |
Remove's uses of sys/timeb.h for Android.
Android is removing sys/timeb.h because it was removed in POSIX 2008.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@210235 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/sanitizer_common/sanitizer_platform_limits_posix.cc')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index 524eec315..4f7c19dc0 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -35,7 +35,6 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> -#include <sys/timeb.h> #include <sys/times.h> #include <sys/types.h> #include <sys/utsname.h> @@ -45,6 +44,7 @@ #if !SANITIZER_ANDROID #include <sys/mount.h> +#include <sys/timeb.h> #endif #if SANITIZER_LINUX @@ -1088,11 +1088,13 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); #endif +#if !SANITIZER_ANDROID CHECK_TYPE_SIZE(timeb); CHECK_SIZE_AND_OFFSET(timeb, time); CHECK_SIZE_AND_OFFSET(timeb, millitm); CHECK_SIZE_AND_OFFSET(timeb, timezone); CHECK_SIZE_AND_OFFSET(timeb, dstflag); +#endif CHECK_TYPE_SIZE(passwd); CHECK_SIZE_AND_OFFSET(passwd, pw_name); |