diff options
| author | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 19:54:37 +0000 |
|---|---|---|
| committer | michaelbai@google.com <michaelbai@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-11 19:54:37 +0000 |
| commit | 39588997bced271d4f1f199e7fd99b51438d080e (patch) | |
| tree | 09f3869fd0c89efad297de22943ba3e833a8fbb5 /net/base/host_resolver_impl.cc | |
| parent | 76730d0e90f60b0e9b1d4b89d2387855211c59a3 (diff) | |
| download | chromium_src-39588997bced271d4f1f199e7fd99b51438d080e.zip chromium_src-39588997bced271d4f1f199e7fd99b51438d080e.tar.gz chromium_src-39588997bced271d4f1f199e7fd99b51438d080e.tar.bz2 | |
Upstream android net related code (part 1)
BUG=
TEST=
Review URL: http://codereview.chromium.org/7277057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/host_resolver_impl.cc')
| -rw-r--r-- | net/base/host_resolver_impl.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index 9b412a0..4898d9e 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -100,7 +100,10 @@ std::vector<int> GetAllGetAddrinfoOSErrors() { int os_errors[] = { #if defined(OS_POSIX) #if !defined(OS_FREEBSD) +#if !defined(OS_ANDROID) + // EAI_ADDRFAMILY has been declared obsolete in Android's netdb.h. EAI_ADDRFAMILY, +#endif EAI_NODATA, #endif EAI_AGAIN, |