| Index: runtime/bin/socket_linux.cc
|
| ===================================================================
|
| --- runtime/bin/socket_linux.cc (revision 19251)
|
| +++ runtime/bin/socket_linux.cc (working copy)
|
| @@ -36,7 +36,7 @@
|
| }
|
|
|
| FDUtils::SetCloseOnExec(fd);
|
| - FDUtils::SetNonBlocking(fd);
|
| + Socket::SetNonBlocking(fd);
|
|
|
| static const size_t kTempBufSize = 1024;
|
| char temp_buf[kTempBufSize];
|
| @@ -230,7 +230,7 @@
|
| return -1;
|
| }
|
|
|
| - FDUtils::SetNonBlocking(fd);
|
| + Socket::SetNonBlocking(fd);
|
| return fd;
|
| }
|
|
|
| @@ -259,7 +259,7 @@
|
| socket = kTemporaryFailure;
|
| }
|
| } else {
|
| - FDUtils::SetNonBlocking(socket);
|
| + Socket::SetNonBlocking(socket);
|
| }
|
| return socket;
|
| }
|
| @@ -276,4 +276,14 @@
|
| }
|
| }
|
|
|
| +
|
| +bool Socket::SetNonBlocking(intptr_t fd) {
|
| + return FDUtils::SetNonBlocking(fd);
|
| +}
|
| +
|
| +
|
| +bool Socket::SetBlocking(intptr_t fd) {
|
| + return FDUtils::SetBlocking(fd);
|
| +}
|
| +
|
| #endif // defined(TARGET_OS_LINUX)
|
|
|