1 files changed, 13 insertions, 10 deletions

diff --git a/deps/uv/test/benchmark-pound.c b/deps/uv/test/benchmark-pound.c
index df19c980c6..7531f55be6 100644
--- a/deps/uv/test/benchmark-pound.c
+++ b/deps/uv/test/benchmark-pound.c
@@ -75,18 +75,18 @@ static uint64_t start; /* in ms  */
 static int closed_streams;
 static int conns_failed;
 
-static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size);
+static void alloc_cb(uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf);
 static void connect_cb(uv_connect_t* conn_req, int status);
-static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf);
+static void read_cb(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf);
 static void close_cb(uv_handle_t* handle);
 
 
-static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size) {
+static void alloc_cb(uv_handle_t* handle,
+                     size_t suggested_size,
+                     uv_buf_t* buf) {
   static char slab[65536];
-  uv_buf_t buf;
-  buf.base = slab;
-  buf.len = sizeof(slab);
-  return buf;
+  buf->base = slab;
+  buf->len = sizeof(slab);
 }
 
 
@@ -135,7 +135,7 @@ static void connect_cb(uv_connect_t* req, int status) {
 }
 
 
-static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf) {
+static void read_cb(uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) {
 
   ASSERT(stream != NULL);
 
@@ -194,14 +194,17 @@ static void pipe_do_setup(int num, void* arg) {
 
 static void tcp_make_connect(conn_rec* p) {
   struct sockaddr_in addr;
+  tcp_conn_rec* tp;
   int r;
 
+  tp = (tcp_conn_rec*) p;
+
   r = uv_tcp_init(loop, (uv_tcp_t*)&p->stream);
   ASSERT(r == 0);
 
-  addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
+  ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
 
-  r = uv_tcp_connect(&((tcp_conn_rec*)p)->conn_req, (uv_tcp_t*)&p->stream, addr, connect_cb);
+  r = uv_tcp_connect(&tp->conn_req, (uv_tcp_t*) &p->stream, &addr, connect_cb);
   if (r) {
     fprintf(stderr, "uv_tcp_connect error %s\n", uv_err_name(r));
     ASSERT(0);