diff options
| author | Patrick Scott <phanna@android.com> | 2010-10-01 13:32:51 -0400 |
|---|---|---|
| committer | Patrick Scott <phanna@android.com> | 2010-10-01 14:11:09 -0400 |
| commit | 49139a52abc21019da7fcbafdef393ad960ea0e2 (patch) | |
| tree | 9c16dadf1f8b024c1613cf10fb4e8b6d8826e7b7 /net/base | |
| parent | e484de727544f835b8e652145af3519d10176234 (diff) | |
| download | external_chromium-49139a52abc21019da7fcbafdef393ad960ea0e2.zip external_chromium-49139a52abc21019da7fcbafdef393ad960ea0e2.tar.gz external_chromium-49139a52abc21019da7fcbafdef393ad960ea0e2.tar.bz2 | |
Build fixes for the simulator.
Change-Id: I4c01c5383d311c7f06e91b1ded529ef6db156b3f
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/file_stream_posix.cc | 6 | ||||
| -rw-r--r-- | net/base/net_util.cc | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/base/file_stream_posix.cc b/net/base/file_stream_posix.cc index 6b2656a..b83729a 100644 --- a/net/base/file_stream_posix.cc +++ b/net/base/file_stream_posix.cc @@ -26,9 +26,11 @@ #include "net/base/net_errors.h" // We cast back and forth, so make sure it's the size we're expecting. -//COMPILE_ASSERT(sizeof(int64) == sizeof(off_t), off_t_64_bit); +#ifdef __BIONIC__ COMPILE_ASSERT(sizeof(int32) == sizeof(off_t), off_t_32_bit); -// I don't tink this will be a problem for now +#else +COMPILE_ASSERT(sizeof(int64) == sizeof(off_t), off_t_64_bit); +#endif // Make sure our Whence mappings match the system headers. COMPILE_ASSERT(net::FROM_BEGIN == SEEK_SET && diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 4accc49..b0715e3 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -67,7 +67,7 @@ #include "unicode/datefmt.h" -#ifdef ANDROID +#ifdef __BIONIC__ #include "netinet/in6.h" #endif |