Browse Source

Upgrade libuv to 66a959c4052

v0.8.7-release
isaacs 13 years ago
parent
commit
571a51989e
  1. 12
      deps/uv/src/unix/linux.c
  2. 4
      deps/uv/test/test-ref.c
  3. 4
      deps/uv/test/test-tty.c

12
deps/uv/src/unix/linux.c

@ -170,11 +170,16 @@ uint64_t uv_get_total_memory(void) {
#if HAVE_INOTIFY_INIT || HAVE_INOTIFY_INIT1 #if HAVE_INOTIFY_INIT || HAVE_INOTIFY_INIT1
static int new_inotify_fd(void) { static int new_inotify_fd(void) {
#if HAVE_INOTIFY_INIT1
return inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
#else
int fd; int fd;
#if HAVE_INOTIFY_INIT1
fd = inotify_init1(IN_NONBLOCK | IN_CLOEXEC);
if (fd != -1)
return fd;
if (errno != ENOSYS)
return -1;
#endif
if ((fd = inotify_init()) == -1) if ((fd = inotify_init()) == -1)
return -1; return -1;
@ -184,7 +189,6 @@ static int new_inotify_fd(void) {
} }
return fd; return fd;
#endif
} }

4
deps/uv/test/test-ref.c

@ -45,7 +45,7 @@ static void write_unref_cb(uv_connect_t* req, int status) {
ASSERT(status == 0); ASSERT(status == 0);
uv_write(&write_req, req->handle, &buf, 1, (uv_write_cb) fail_cb); uv_write(&write_req, req->handle, &buf, 1, (uv_write_cb) fail_cb);
uv_unref(uv_default_loop()); // uv_write refs the loop uv_unref(uv_default_loop()); /* uv_write refs the loop */
} }
@ -55,7 +55,7 @@ static void shutdown_unref_cb(uv_connect_t* req, int status) {
ASSERT(status == 0); ASSERT(status == 0);
uv_shutdown(&shutdown_req, req->handle, (uv_shutdown_cb) fail_cb); uv_shutdown(&shutdown_req, req->handle, (uv_shutdown_cb) fail_cb);
uv_unref(uv_default_loop()); // uv_shutdown refs the loop uv_unref(uv_default_loop()); /* uv_shutdown refs the loop */
} }

4
deps/uv/test/test-tty.c

@ -25,7 +25,7 @@
#ifdef _WIN32 #ifdef _WIN32
# include <io.h> # include <io.h>
# include <windows.h> # include <windows.h>
#else // Unix #else /* Unix */
# include <fcntl.h> # include <fcntl.h>
# include <unistd.h> # include <unistd.h>
#endif #endif
@ -37,7 +37,7 @@ TEST_IMPL(tty) {
uv_tty_t tty_in, tty_out; uv_tty_t tty_in, tty_out;
uv_loop_t* loop = uv_default_loop(); uv_loop_t* loop = uv_default_loop();
// Make sure we have an FD that refers to a tty /* Make sure we have an FD that refers to a tty */
#ifdef _WIN32 #ifdef _WIN32
HANDLE handle; HANDLE handle;
handle = CreateFileA("conin$", handle = CreateFileA("conin$",

Loading…
Cancel
Save