From dbdcee2d2554090597a2fb66162082c1cdc14a49 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Mon, 10 Jun 2013 23:20:45 +0200
Subject: [PATCH] Android really dislikes the AI_V4MAPPED flag to getaddrinfo.

---
 net/resolve.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/resolve.cpp b/net/resolve.cpp
index 9ba7d6634c..bbc9708f3f 100644
--- a/net/resolve.cpp
+++ b/net/resolve.cpp
@@ -83,7 +83,11 @@ bool DNSResolve(const std::string &host, const std::string &service, addrinfo **
 	hints.ai_socktype = SOCK_STREAM;
 #ifdef BLACKBERRY
 	hints.ai_flags = 0;
+#elif ANDROID
+	hints.ai_flags = AI_ADDRCONFIG;
 #else
+	// AI_V4MAPPED seems to have issues on some platforms, not sure we should include it:
+	// http://stackoverflow.com/questions/1408030/what-is-the-purpose-of-the-ai-v4mapped-flag-in-getaddrinfo
 	hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
 #endif
 	hints.ai_protocol = IPPROTO_TCP;