From 5ce1f03f92a032810add9e5425208ee90a8e59ff Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Wed, 20 Jan 2010 02:14:26 +0000 Subject: [PATCH] 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 --- net/socket/socks5_client_socket.cc | 2 -- net/socket/socks5_client_socket.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc index d546231bec24f5..a4ba814fd624ad 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 diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h index f8de9a6df2dc75..dec1cc476cdb18 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -56,9 +56,7 @@ class SOCKS5ClientSocket : public ClientSocket { virtual bool SetReceiveBufferSize(int32 size); virtual bool SetSendBufferSize(int32 size); -#if defined(OS_LINUX) virtual int GetPeerName(struct sockaddr* name, socklen_t* namelen); -#endif private: enum State {