summaryrefslogtreecommitdiffstats
path: root/net/socket/socks5_client_socket.cc
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 02:14:26 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-20 02:14:26 +0000
commit5ce1f03f92a032810add9e5425208ee90a8e59ff (patch)
tree9e3e77a6c64ff30277a221ca96be757de60de06f /net/socket/socks5_client_socket.cc
parent330c630ec1bf6451d03dcee3bc66fa7a6f1fe4a6 (diff)
downloadchromium_src-5ce1f03f92a032810add9e5425208ee90a8e59ff.zip
chromium_src-5ce1f03f92a032810add9e5425208ee90a8e59ff.tar.gz
chromium_src-5ce1f03f92a032810add9e5425208ee90a8e59ff.tar.bz2
Re-revert 36595 (restoring 36548); that didn't fix anything.
BUG=none TEST=none TBR=thomasvl@chromium.org Review URL: http://codereview.chromium.org/548082 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/socks5_client_socket.cc')
-rw-r--r--net/socket/socks5_client_socket.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc
index d546231..a4ba814 100644
--- a/net/socket/socks5_client_socket.cc
+++ b/net/socket/socks5_client_socket.cc
@@ -443,11 +443,9 @@ int SOCKS5ClientSocket::DoHandshakeReadComplete(int result) {
return OK;
}
-#if defined(OS_LINUX)
int SOCKS5ClientSocket::GetPeerName(struct sockaddr* name,
socklen_t* namelen) {
return transport_->GetPeerName(name, namelen);
}
-#endif
} // namespace net