Browse Source

uv: upgrade to b328e4c

v0.7.4-release
Ben Noordhuis 14 years ago
parent
commit
e62cdd0488
  1. 20
      deps/uv/src/uv-unix.c
  2. 2
      deps/uv/src/win/process.c

20
deps/uv/src/uv-unix.c

@ -331,20 +331,20 @@ static int uv__bind(uv_tcp_t* tcp, int domain, struct sockaddr* addr,
int addrsize) { int addrsize) {
int saved_errno; int saved_errno;
int status; int status;
int fd;
saved_errno = errno; saved_errno = errno;
status = -1; status = -1;
if (tcp->fd <= 0) { if (tcp->fd < 0) {
if ((fd = uv__socket(domain, SOCK_STREAM, 0)) == -1) { if ((tcp->fd = uv__socket(domain, SOCK_STREAM, 0)) == -1) {
uv_err_new((uv_handle_t*)tcp, errno); uv_err_new((uv_handle_t*)tcp, errno);
goto out; goto out;
} }
if (uv__stream_open((uv_stream_t*)tcp, fd, UV_READABLE | UV_WRITABLE)) { if (uv__stream_open((uv_stream_t*)tcp, tcp->fd, UV_READABLE | UV_WRITABLE)) {
uv__close(tcp->fd);
tcp->fd = -1;
status = -2; status = -2;
uv__close(fd);
goto out; goto out;
} }
} }
@ -515,21 +515,21 @@ int uv_listen(uv_stream_t* stream, int backlog, uv_connection_cb cb) {
static int uv_tcp_listen(uv_tcp_t* tcp, int backlog, uv_connection_cb cb) { static int uv_tcp_listen(uv_tcp_t* tcp, int backlog, uv_connection_cb cb) {
int r; int r;
int fd;
if (tcp->delayed_error) { if (tcp->delayed_error) {
uv_err_new((uv_handle_t*)tcp, tcp->delayed_error); uv_err_new((uv_handle_t*)tcp, tcp->delayed_error);
return -1; return -1;
} }
if (tcp->fd <= 0) { if (tcp->fd < 0) {
if ((fd = uv__socket(AF_INET, SOCK_STREAM, 0)) == -1) { if ((tcp->fd = uv__socket(AF_INET, SOCK_STREAM, 0)) == -1) {
uv_err_new((uv_handle_t*)tcp, errno); uv_err_new((uv_handle_t*)tcp, errno);
return -1; return -1;
} }
if (uv__stream_open((uv_stream_t*)tcp, fd, UV_READABLE)) { if (uv__stream_open((uv_stream_t*)tcp, tcp->fd, UV_READABLE)) {
uv__close(fd); uv__close(tcp->fd);
tcp->fd = -1;
return -1; return -1;
} }
} }

2
deps/uv/src/win/process.c

@ -36,7 +36,7 @@ typedef struct env_var {
int value_len; int value_len;
} env_var_t; } env_var_t;
#define E_V(str) { str "=", L"" str, sizeof(str), 0, 0 } #define E_V(str) { str "=", L##str, sizeof(str), 0, 0 }
#define UTF8_TO_UTF16(s, t) \ #define UTF8_TO_UTF16(s, t) \
size = uv_utf8_to_utf16(s, NULL, 0) * sizeof(wchar_t); \ size = uv_utf8_to_utf16(s, NULL, 0) * sizeof(wchar_t); \

Loading…
Cancel
Save