diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:18:23 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-21 19:18:23 +0000 |
| commit | e01f942655774bae103f142542ab678eec5bfeb5 (patch) | |
| tree | 899bf20d8cff6de3b9c1b1483ec49a53ac1c0b31 /net/base/net_util.cc | |
| parent | 57902f6dbc700e527513aef871f06fd23d9f9f56 (diff) | |
| download | chromium_src-e01f942655774bae103f142542ab678eec5bfeb5.zip chromium_src-e01f942655774bae103f142542ab678eec5bfeb5.tar.gz chromium_src-e01f942655774bae103f142542ab678eec5bfeb5.tar.bz2 | |
Add net_util* to the SCons build. Fixes some ICU UChar issues in net_util. Also disable NetUtilTest.FileURLConversion because it seems to have Windows specific output (is this the right thing to do?).
The other changes to net_util_unittest is to get arraysize to work (see the comment in base/basictypes.h).
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1168 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/net_util.cc')
| -rw-r--r-- | net/base/net_util.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/base/net_util.cc b/net/base/net_util.cc index c2f9c7c..906c16a 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -37,7 +37,6 @@ #ifdef OS_WIN #include <windows.h> -#include <wininet.h> #endif #include "net/base/net_util.h" @@ -881,6 +880,7 @@ std::string CanonicalizeHost(const std::wstring& host, bool* is_ip_address) { return CanonicalizeHost(converted_host, is_ip_address); } +#ifdef OS_WIN std::string GetDirectoryListingHeader(const std::string& title) { std::string result = NetModule::GetResource(IDR_DIR_HEADER_HTML); if (result.empty()) { @@ -894,7 +894,6 @@ std::string GetDirectoryListingHeader(const std::string& title) { return result; } -#ifdef OS_WIN std::string GetDirectoryListingEntry(const std::string& name, DWORD attrib, int64 size, |