diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index c1f9da9..76865b7 100644
--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -90,13 +90,19 @@
     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