[compiler-rt] r175503 - [sanitizer] Fix Android build.

[Evgeniy Stepanov]

Author: eugenis
Date: Tue Feb 19 05:06:41 2013
New Revision: 175503

URL: http://llvm.org/viewvc/llvm-project?rev=175503&view=rev
Log:
[sanitizer] Fix Android build.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc?rev=175503&r1=175502&r2=175503&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.cc Tue Feb 19 05:06:41 2013
@@ -40,13 +40,16 @@ namespace __sanitizer {
 
 #if defined(__linux__)
   unsigned struct_rlimit_sz = sizeof(struct rlimit);
-  unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
   unsigned struct_dirent_sz = sizeof(struct dirent);
   unsigned struct_statfs_sz = sizeof(struct statfs);
-  unsigned struct_statfs64_sz = sizeof(struct statfs64);
   unsigned struct_epoll_event_sz = sizeof(struct epoll_event);
 #endif // __linux__
 
+#if defined(__linux__) && !defined(__ANDROID__)
+  unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+  unsigned struct_statfs64_sz = sizeof(struct statfs64);
+#endif // __linux__ && !__ANDROID__
+
   void* __sanitizer_get_msghdr_iov_iov_base(void* msg, int idx) {
     return ((struct msghdr *)msg)->msg_iov[idx].iov_base;
   }

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h?rev=175503&r1=175502&r2=175503&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_platform_limits_posix.h Tue Feb 19 05:06:41 2013
@@ -24,13 +24,16 @@ namespace __sanitizer {
 
 #if defined(__linux__)
   extern unsigned struct_rlimit_sz;
-  extern unsigned struct_rlimit64_sz;
   extern unsigned struct_dirent_sz;
   extern unsigned struct_statfs_sz;
-  extern unsigned struct_statfs64_sz;
   extern unsigned struct_epoll_event_sz;
 #endif // __linux__
 
+#if defined(__linux__) && !defined(__ANDROID__)
+  extern unsigned struct_rlimit64_sz;
+  extern unsigned struct_statfs64_sz;
+#endif // __linux__ && !__ANDROID__
+
   void* __sanitizer_get_msghdr_iov_iov_base(void* msg, int idx);
   uptr __sanitizer_get_msghdr_iov_iov_len(void* msg, int idx);
   uptr __sanitizer_get_msghdr_iovlen(void* msg);