summaryrefslogtreecommitdiffstats
path: root/net/net_lib.scons
diff options
context:
space:
mode:
authorerikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 01:06:15 +0000
committererikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-11 01:06:15 +0000
commitf6f1ba3cfd72905cd900e6266589ccb4a1650cb0 (patch)
tree957e236fd4f8b3e3578a7c7208e3ea6a79c65aee /net/net_lib.scons
parent043c9a78957bf3f7de4b53e41ec91bf22be69949 (diff)
downloadchromium_src-f6f1ba3cfd72905cd900e6266589ccb4a1650cb0.zip
chromium_src-f6f1ba3cfd72905cd900e6266589ccb4a1650cb0.tar.gz
chromium_src-f6f1ba3cfd72905cd900e6266589ccb4a1650cb0.tar.bz2
Change made by external contributor Ibrar Ahmed (ibrar.ahmad@gmail.com), reviewed by erikkay:
http://codereview.chromium.org/6577/show ports listen_socket and telnet_server to POSIX I had to make some changes to get this to work on Mac and to fix a few regressions it caused in Windows, so please take a fresh look at this diff Dan. Ibrar, please take a look at the changes from your patch to mine (you may need to diff listen_socket_unittest.h with listen_socket_unittest.cc manually since I moved a bunch of code here). Some were bugs that I should have caught in review, some were bugs that only got tickled on the Mac, others were just cleanup. Comments welcome. Review URL: http://codereview.chromium.org/9260 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net_lib.scons')
-rw-r--r--net/net_lib.scons4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 5361f5b..a7fb282 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -55,7 +55,6 @@ input_files = [
'base/sdch_filter.cc',
'base/sdch_manager.cc',
'base/ssl_config_service.cc',
- 'base/telnet_server.cc',
'base/upload_data.cc',
'base/upload_data_stream.cc',
'base/x509_certificate.cc',
@@ -111,9 +110,7 @@ if env['PLATFORM'] in ('posix', 'darwin'):
# TODO(port): delete files from this list as they get ported.
to_be_ported_files = [
'base/directory_lister.cc',
- 'base/listen_socket.cc',
'base/ssl_config_service.cc',
- 'base/telnet_server.cc',
'http/http_transaction_winhttp.cc',
'http/winhttp_request_throttle.cc',
'url_request/url_request_file_dir_job.cc',
@@ -161,6 +158,7 @@ if env['PLATFORM'] in ('darwin', 'posix'):
'base/file_stream_posix.cc',
'base/net_util_posix.cc',
'base/tcp_client_socket_libevent.cc',
+ 'base/telnet_server.cc',
'disk_cache/cache_util_posix.cc',
'disk_cache/file_posix.cc',
'disk_cache/mapped_file_posix.cc',