summaryrefslogtreecommitdiff
path: root/src/tcp_wrap.cc
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-09-04 14:46:35 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-09-04 18:11:32 +0200
commit7494c84fe6fa1127de5a9827119d9e389cbfb016 (patch)
tree6f9ca90a24ea233aa3426579a455a425fbad470d /src/tcp_wrap.cc
parent358c2901567c005689dceef1361754cca95ca14e (diff)
downloadandroid-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 'src/tcp_wrap.cc')
-rw-r--r--src/tcp_wrap.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/tcp_wrap.cc b/src/tcp_wrap.cc
index 43a6f900b3..e007056296 100644
--- a/src/tcp_wrap.cc
+++ b/src/tcp_wrap.cc
@@ -272,7 +272,7 @@ void TCPWrap::Bind(const FunctionCallbackInfo<Value>& args) {
sockaddr_in addr;
int err = uv_ip4_addr(*ip_address, port, &addr);
if (err == 0)
- err = uv_tcp_bind(&wrap->handle_, &addr);
+ err = uv_tcp_bind(&wrap->handle_, reinterpret_cast<const sockaddr*>(&addr));
args.GetReturnValue().Set(err);
}
@@ -290,7 +290,7 @@ void TCPWrap::Bind6(const FunctionCallbackInfo<Value>& args) {
sockaddr_in6 addr;
int err = uv_ip6_addr(*ip6_address, port, &addr);
if (err == 0)
- err = uv_tcp_bind6(&wrap->handle_, &addr);
+ err = uv_tcp_bind(&wrap->handle_, reinterpret_cast<const sockaddr*>(&addr));
args.GetReturnValue().Set(err);
}
@@ -387,7 +387,10 @@ void TCPWrap::Connect(const FunctionCallbackInfo<Value>& args) {
if (err == 0) {
ConnectWrap* req_wrap = new ConnectWrap(req_wrap_obj);
- err = uv_tcp_connect(&req_wrap->req_, &wrap->handle_, &addr, AfterConnect);
+ err = uv_tcp_connect(&req_wrap->req_,
+ &wrap->handle_,
+ reinterpret_cast<const sockaddr*>(&addr),
+ AfterConnect);
req_wrap->Dispatched();
if (err) delete req_wrap;
}
@@ -415,7 +418,10 @@ void TCPWrap::Connect6(const FunctionCallbackInfo<Value>& args) {
if (err == 0) {
ConnectWrap* req_wrap = new ConnectWrap(req_wrap_obj);
- err = uv_tcp_connect6(&req_wrap->req_, &wrap->handle_, &addr, AfterConnect);
+ err = uv_tcp_connect(&req_wrap->req_,
+ &wrap->handle_,
+ reinterpret_cast<const sockaddr*>(&addr),
+ AfterConnect);
req_wrap->Dispatched();
if (err) delete req_wrap;
}