diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-05 20:13:53 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:06 +0100 |
| commit | ddaac50eee27e3c14f766f64aa6d3957c90af3f8 (patch) | |
| tree | 90f1d5dc44937024da2e7379fec7aad3b89035f3 /net | |
| parent | faec8d190b264979f922e58a4e4912afdff51dd2 (diff) | |
| download | external_chromium-ddaac50eee27e3c14f766f64aa6d3957c90af3f8.zip external_chromium-ddaac50eee27e3c14f766f64aa6d3957c90af3f8.tar.gz external_chromium-ddaac50eee27e3c14f766f64aa6d3957c90af3f8.tar.bz2 | |
Merge Chromium at r12.0.742.93: Compile fix in net_util_posix.cc
Change-Id: I7a758d171b67714048dbad8b52143a63af750a41
http://codereview.chromium.org/6676027
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/net_util_posix.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/base/net_util_posix.cc b/net/base/net_util_posix.cc index af3d5d1..f4c18fa 100644 --- a/net/base/net_util_posix.cc +++ b/net/base/net_util_posix.cc @@ -4,7 +4,9 @@ #include "net/base/net_util.h" +#ifndef ANDROID #include <ifaddrs.h> +#endif #include <sys/types.h> #include "base/eintr_wrapper.h" @@ -53,6 +55,7 @@ bool FileURLToFilePath(const GURL& url, FilePath* path) { return !file_path_str.empty(); } +#ifndef ANDROID bool GetNetworkList(NetworkInterfaceList* networks) { // getifaddrs() may require IO operations. base::ThreadRestrictions::AssertIOAllowed(); @@ -80,5 +83,6 @@ bool GetNetworkList(NetworkInterfaceList* networks) { return true; } +#endif } // namespace net |