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

[Evgeniy Stepanov]

Author: eugenis
Date: Wed May 22 09:26:52 2013
New Revision: 182479

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

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

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=182479&r1=182478&r2=182479&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 Wed May 22 09:26:52 2013
@@ -90,13 +90,19 @@ namespace __sanitizer {
     int ai_family;
     int ai_socktype;
     int ai_protocol;
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
-    uptr ai_addrlen;
-#else
+#if SANITIZER_MAC
     unsigned ai_addrlen;
-#endif
     void *ai_addr;
     char *ai_canonname;
+#elif SANITIZER_ANDROID
+    unsigned ai_addrlen;
+    char *ai_canonname;
+    void *ai_addr;
+#else // LINUX
+    uptr ai_addrlen;
+    void *ai_addr;
+    char *ai_canonname;
+#endif
     struct __sanitizer_addrinfo *ai_next;
   };
 }  // namespace __sanitizer