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
hylschwy · Jan 20, 2010 · 5ce1f03 · 5ce1f03
1 parent 330c630
commit 5ce1f03
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git 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
@@ -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 {