diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-30 01:37:05 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-30 01:37:05 +0000 |
| commit | 44fd14c5ade3ff22063382c63409ba18bcb5d50a (patch) | |
| tree | d3cf83ec7e689f54832629ebf8af913c0639f121 /net | |
| parent | cc510c17f62f0f1654b51d6edd055976dbf16a6e (diff) | |
| download | chromium_src-44fd14c5ade3ff22063382c63409ba18bcb5d50a.zip chromium_src-44fd14c5ade3ff22063382c63409ba18bcb5d50a.tar.gz chromium_src-44fd14c5ade3ff22063382c63409ba18bcb5d50a.tar.bz2 | |
Get open-vcdiff building on Linux and Mac (in SCons) using
captured values for generating a config.h file.
Builds base/sdch_{filter,manager}.cc on all platforms and links
the 'sdch' library.
Add sdch to the SCons configuration loaded on Mac and Linux.
Removes platform #ifs in net/base/filter.cc initialization code
(reverting r2740).
B=2662
Review URL: http://codereview.chromium.org/5204
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2710 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/SConscript | 8 | ||||
| -rw-r--r-- | net/base/filter.cc | 9 |
2 files changed, 3 insertions, 14 deletions
diff --git a/net/SConscript b/net/SConscript index c8f879d..28f730b 100644 --- a/net/SConscript +++ b/net/SConscript @@ -48,6 +48,8 @@ input_files = [ 'base/net_module.cc', 'base/net_util.cc', 'base/registry_controlled_domain.cc', + 'base/sdch_filter.cc', + 'base/sdch_manager.cc', 'base/upload_data.cc', 'base/x509_certificate.cc', 'disk_cache/backend_impl.cc', @@ -91,8 +93,6 @@ if env['PLATFORM'] == 'win32': 'base/directory_lister.cc', 'base/dns_resolution_observer.cc', 'base/listen_socket.cc', - 'base/sdch_filter.cc', - 'base/sdch_manager.cc', 'base/ssl_client_socket.cc', 'base/ssl_config_service.cc', 'base/tcp_client_socket.cc', @@ -177,6 +177,7 @@ env_tests.Prepend( 'base', 'googleurl', 'gtest', + 'sdch', env_tests['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed 'modp_b64', 'zlib', @@ -210,9 +211,6 @@ if env['PLATFORM'] == 'win32': '/ignore:4199', '/nxcompat', ], - LIBS =[ - 'sdch', - ], ) if env['PLATFORM'] in ('posix', 'darwin'): diff --git a/net/base/filter.cc b/net/base/filter.cc index 701b9c6..c59e7f0 100644 --- a/net/base/filter.cc +++ b/net/base/filter.cc @@ -7,10 +7,7 @@ #include "base/string_util.h" #include "net/base/gzip_filter.h" #include "net/base/bzip2_filter.h" -#if defined(OS_WIN) || defined(OS_MACOSX) -// TODO(port): remove #ifdef when sdch works on all platforms. #include "net/base/sdch_filter.h" -#endif namespace { @@ -85,11 +82,8 @@ Filter* Filter::SingleFilter(const std::string& filter_type, } else if (LowerCaseEqualsASCII(filter_type, kBZip2) || LowerCaseEqualsASCII(filter_type, kXBZip2)) { type_id = FILTER_TYPE_BZIP2; -#if defined(OS_WIN) || defined(OS_MACOSX) - // TODO(port): remove #ifdef when sdch works on all platforms. } else if (LowerCaseEqualsASCII(filter_type, kSdch)) { type_id = FILTER_TYPE_SDCH; -#endif } else { // Note we also consider "identity" and "uncompressed" UNSUPPORTED as // filter should be disabled in such cases. @@ -116,8 +110,6 @@ Filter* Filter::SingleFilter(const std::string& filter_type, } break; } -#if defined(OS_WIN) || defined(OS_MACOSX) - // TODO(port): remove #ifdef when sdch works on all platforms. case FILTER_TYPE_SDCH: { scoped_ptr<SdchFilter> sdch_filter(new SdchFilter()); if (sdch_filter->InitBuffer(buffer_size)) { @@ -127,7 +119,6 @@ Filter* Filter::SingleFilter(const std::string& filter_type, } break; } -#endif default: { break; } |