diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 01:42:32 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-20 01:42:32 +0000 |
| commit | 201d8cb9e4fd1d6b8bb2c86fd8a641b28df0310a (patch) | |
| tree | 3d2d921ca56861785bc21049ea384c15cdc3a640 /net | |
| parent | 4da216df7325d1ea00757051701fd2f6c116a9e5 (diff) | |
| download | chromium_src-201d8cb9e4fd1d6b8bb2c86fd8a641b28df0310a.zip chromium_src-201d8cb9e4fd1d6b8bb2c86fd8a641b28df0310a.tar.gz chromium_src-201d8cb9e4fd1d6b8bb2c86fd8a641b28df0310a.tar.bz2 | |
Try reverting r36548 to see if this causes the webkit linux failures to
improve.
BUG=none
TBR=thomasvl@chromium.org
TEST=none
Review URL: http://codereview.chromium.org/551076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket/socks5_client_socket.cc | 2 | ||||
| -rw-r--r-- | net/socket/socks5_client_socket.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc index a4ba814..d546231 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc @@ -443,9 +443,11 @@ 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 dec1cc4..f8de9a6 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h @@ -56,7 +56,9 @@ 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 { |