diff options
author | Bert Belder <bertbelder@gmail.com> | 2012-08-07 01:25:06 +0200 |
---|---|---|
committer | Bert Belder <bertbelder@gmail.com> | 2012-08-07 01:57:56 +0200 |
commit | e0a603a4993e995080a8926fcddbbde752a2136e (patch) | |
tree | 34a57a6d3217c06550da581635dea57799fba176 /deps/uv/src/uv-common.c | |
parent | 9e55ba7d6bbfeaa867e0f151dd27bc0ba034cad7 (diff) | |
download | android-node-v8-e0a603a4993e995080a8926fcddbbde752a2136e.tar.gz android-node-v8-e0a603a4993e995080a8926fcddbbde752a2136e.tar.bz2 android-node-v8-e0a603a4993e995080a8926fcddbbde752a2136e.zip |
uv: upgrade to 3a8bb3b
Diffstat (limited to 'deps/uv/src/uv-common.c')
-rw-r--r-- | deps/uv/src/uv-common.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/deps/uv/src/uv-common.c b/deps/uv/src/uv-common.c index 9639634a1d..75dfcd89c2 100644 --- a/deps/uv/src/uv-common.c +++ b/deps/uv/src/uv-common.c @@ -28,10 +28,6 @@ #include <stdlib.h> /* malloc */ #include <string.h> /* memset */ -/* use inet_pton from c-ares if necessary */ -#include "ares_config.h" -#include "ares/inet_net_pton.h" -#include "ares/inet_ntop.h" #define XX(uc, lc) case UV_##uc: return sizeof(uv_##lc##_t); @@ -182,21 +178,21 @@ struct sockaddr_in6 uv_ip6_addr(const char* ip, int port) { addr.sin6_family = AF_INET6; addr.sin6_port = htons(port); - ares_inet_pton(AF_INET6, ip, &addr.sin6_addr); + uv_inet_pton(AF_INET6, ip, &addr.sin6_addr); return addr; } int uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) { - const char* d = ares_inet_ntop(AF_INET, &src->sin_addr, dst, size); - return d != dst; + uv_err_t err = uv_inet_ntop(AF_INET, &src->sin_addr, dst, size); + return err.code != UV_OK; } int uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) { - const char* d = ares_inet_ntop(AF_INET6, &src->sin6_addr, dst, size); - return d != dst; + uv_err_t err = uv_inet_ntop(AF_INET6, &src->sin6_addr, dst, size); + return err.code != UV_OK; } |