| Index: runtime/bin/socket_android.cc
|
| ===================================================================
|
| --- runtime/bin/socket_android.cc (revision 19251)
|
| +++ runtime/bin/socket_android.cc (working copy)
|
| @@ -34,7 +34,7 @@
|
| }
|
|
|
| FDUtils::SetCloseOnExec(fd);
|
| - FDUtils::SetNonBlocking(fd);
|
| + Socket::SetNonBlocking(fd);
|
|
|
| server = gethostbyname(host);
|
| if (server == NULL) {
|
| @@ -218,7 +218,7 @@
|
| return -1;
|
| }
|
|
|
| - FDUtils::SetNonBlocking(fd);
|
| + Socket::SetNonBlocking(fd);
|
| return fd;
|
| }
|
|
|
| @@ -247,7 +247,7 @@
|
| socket = kTemporaryFailure;
|
| }
|
| } else {
|
| - FDUtils::SetNonBlocking(socket);
|
| + Socket::SetNonBlocking(socket);
|
| }
|
| return socket;
|
| }
|
| @@ -264,4 +264,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_ANDROID)
|
|
|