diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-09-04 14:46:35 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-09-04 18:11:32 +0200 |
commit | 7494c84fe6fa1127de5a9827119d9e389cbfb016 (patch) | |
tree | 6f9ca90a24ea233aa3426579a455a425fbad470d /deps/uv/test/benchmark-pump.c | |
parent | 358c2901567c005689dceef1361754cca95ca14e (diff) | |
download | android-node-v8-7494c84fe6fa1127de5a9827119d9e389cbfb016.tar.gz android-node-v8-7494c84fe6fa1127de5a9827119d9e389cbfb016.tar.bz2 android-node-v8-7494c84fe6fa1127de5a9827119d9e389cbfb016.zip |
uv: upgrade to v0.11.13
This commit changes src/tcp_wrap.cc and src/udp_wrap.cc just enough to
get by (i.e. to compile and function correctly.)
The new libuv API allows for more cleanup and deduplication but I'm
saving that for another day.
Diffstat (limited to 'deps/uv/test/benchmark-pump.c')
-rw-r--r-- | deps/uv/test/benchmark-pump.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/deps/uv/test/benchmark-pump.c b/deps/uv/test/benchmark-pump.c index ac132cbfdc..eda3c142d7 100644 --- a/deps/uv/test/benchmark-pump.c +++ b/deps/uv/test/benchmark-pump.c @@ -240,7 +240,10 @@ static void maybe_connect_some(void) { ASSERT(r == 0); req = (uv_connect_t*) req_alloc(); - r = uv_tcp_connect(req, tcp, &connect_addr, connect_cb); + r = uv_tcp_connect(req, + tcp, + (const struct sockaddr*) &connect_addr, + connect_cb); ASSERT(r == 0); } else { pipe = &pipe_write_handles[max_connect_socket++]; @@ -366,7 +369,7 @@ HELPER_IMPL(tcp_pump_server) { server = (uv_stream_t*)&tcpServer; r = uv_tcp_init(loop, &tcpServer); ASSERT(r == 0); - r = uv_tcp_bind(&tcpServer, &listen_addr); + r = uv_tcp_bind(&tcpServer, (const struct sockaddr*) &listen_addr); ASSERT(r == 0); r = uv_listen((uv_stream_t*)&tcpServer, MAX_WRITE_HANDLES, connection_cb); ASSERT(r == 0); |