Chromium Code Reviews| Index: runtime/bin/socket_macos.cc |
| diff --git a/runtime/bin/socket_macos.cc b/runtime/bin/socket_macos.cc |
| index ffe0aeed679c83b217f2fe0357a7a15aaffac602..e9948105d07964a49eb78a874a11c37ad66b42f0 100644 |
| --- a/runtime/bin/socket_macos.cc |
| +++ b/runtime/bin/socket_macos.cc |
| @@ -86,7 +86,7 @@ intptr_t Socket::CreateConnect(RawAddr addr, const intptr_t port) { |
| return fd; |
| } |
| - Socket::SetNonBlocking(fd); |
| + FDUtils::SetNonBlocking(fd); |
| return Socket::Connect(fd, addr, port); |
| } |
| @@ -298,7 +298,7 @@ intptr_t Socket::CreateBindDatagram( |
| return -1; |
| } |
| - Socket::SetNonBlocking(fd); |
| + FDUtils::SetNonBlocking(fd); |
| return fd; |
| } |
| @@ -398,7 +398,7 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr, |
| return -1; |
| } |
| - Socket::SetNonBlocking(fd); |
| + FDUtils::SetNonBlocking(fd); |
| return fd; |
| } |
| @@ -423,7 +423,8 @@ intptr_t ServerSocket::Accept(intptr_t fd) { |
| socket = kTemporaryFailure; |
| } |
| } else { |
| - Socket::SetNonBlocking(socket); |
| + FDUtils::SetNonBlocking(socket); |
| + FDUtils::SetCloseOnExec(socket); |
|
kustermann
2015/02/09 16:25:32
ditto.
Søren Gjesse
2015/02/10 07:28:15
Done.
|
| } |
| return socket; |
| } |
| @@ -435,16 +436,6 @@ void Socket::Close(intptr_t fd) { |
| } |
| -bool Socket::SetNonBlocking(intptr_t fd) { |
| - return FDUtils::SetNonBlocking(fd); |
| -} |
| - |
| - |
| -bool Socket::SetBlocking(intptr_t fd) { |
| - return FDUtils::SetBlocking(fd); |
| -} |
| - |
| - |
| bool Socket::GetNoDelay(intptr_t fd, bool* enabled) { |
| int on; |
| socklen_t len = sizeof(on); |