diff options
| author | Stephen Hines <srhines@google.com> | 2014-06-05 09:48:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 09:48:17 +0000 |
| commit | 373c7a87ef89fd44ee7eb96bb060b4ceaecc948d (patch) | |
| tree | f566910aafdb1f3032662db7a07f73c64104aec3 | |
| parent | 4d95370ef91dce05de74eac0c4a63141b5f7c131 (diff) | |
| parent | 706625d653c90b26036767b549e04aedfc54b08c (diff) | |
| download | compiler-rt-373c7a87ef89fd44ee7eb96bb060b4ceaecc948d.tar.gz | |
am 706625d6: Merge "Revert "Bionic is getting rid of sys/timeb.h""
* commit '706625d653c90b26036767b549e04aedfc54b08c':
Revert "Bionic is getting rid of sys/timeb.h"
| -rw-r--r-- | lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index 4f7c19dc0..524eec315 100644 --- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -35,6 +35,7 @@ #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> @@ -44,7 +45,6 @@ #if !SANITIZER_ANDROID #include <sys/mount.h> -#include <sys/timeb.h> #endif #if SANITIZER_LINUX @@ -1088,13 +1088,11 @@ 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); |