summaryrefslogtreecommitdiff
path: root/deps/uv/test/test-poll.c
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-09-03 00:42:59 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-09-03 01:17:58 +0200
commited8d97f572fab15025da0c762e5edfbcbe45f425 (patch)
treeca92b0ac08b5ebc14848883e4cba4e1edc9dd46b /deps/uv/test/test-poll.c
parent185c515c9febf2229ed2ac76bfdd0c767ea7fd43 (diff)
downloadandroid-node-v8-ed8d97f572fab15025da0c762e5edfbcbe45f425.tar.gz
android-node-v8-ed8d97f572fab15025da0c762e5edfbcbe45f425.tar.bz2
android-node-v8-ed8d97f572fab15025da0c762e5edfbcbe45f425.zip
uv: upgrade to v0.11.12
* upgrade deps/uv/ to v0.11.12. * update files in src/ after a libuv API change.
Diffstat (limited to 'deps/uv/test/test-poll.c')
-rw-r--r--deps/uv/test/test-poll.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/deps/uv/test/test-poll.c b/deps/uv/test/test-poll.c
index 1ca9c92135..135c72974d 100644
--- a/deps/uv/test/test-poll.c
+++ b/deps/uv/test/test-poll.c
@@ -496,11 +496,13 @@ static void server_poll_cb(uv_poll_t* handle, int status, int events) {
static void start_server(void) {
- uv_os_sock_t sock;
server_context_t* context;
+ struct sockaddr_in addr;
+ uv_os_sock_t sock;
int r;
- sock = create_nonblocking_bound_socket(uv_ip4_addr("127.0.0.1", TEST_PORT));
+ ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
+ sock = create_nonblocking_bound_socket(addr);
context = create_server_context(sock);
r = listen(sock, 100);
@@ -514,10 +516,14 @@ static void start_server(void) {
static void start_client(void) {
uv_os_sock_t sock;
connection_context_t* context;
- struct sockaddr_in server_addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
+ struct sockaddr_in server_addr;
+ struct sockaddr_in addr;
int r;
- sock = create_nonblocking_bound_socket(uv_ip4_addr("0.0.0.0", 0));
+ ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &server_addr));
+ ASSERT(0 == uv_ip4_addr("0.0.0.0", 0, &addr));
+
+ sock = create_nonblocking_bound_socket(addr);
context = create_connection_context(sock, 0);
context->events = UV_READABLE | UV_WRITABLE;