From ec24bfac194419fae2b66aa2bb0d8d9d2cb4547a Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sun, 31 Mar 2013 20:02:24 +0200 Subject: [PATCH 1/2] include: update uv_backend_fd() documentation uv_run_once() is no more, replace with uv_run(UV_RUN_NOWAIT). Fixes #759. --- include/uv.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/uv.h b/include/uv.h index 553fc133..dd836131 100644 --- a/include/uv.h +++ b/include/uv.h @@ -294,8 +294,8 @@ UV_EXTERN uint64_t uv_now(uv_loop_t*); * Get backend file descriptor. Only kqueue, epoll and event ports are * supported. * - * This can be used in conjunction with uv_run_once() to poll in one thread and - * run the event loop's event callbacks in another. + * This can be used in conjunction with `uv_run(loop, UV_RUN_NOWAIT)` to + * poll in one thread and run the event loop's event callbacks in another. * * Useful for embedding libuv's event loop in another event loop. * See test/test-embed.c for an example. From f1215b791811e5c860152ecde038f35537dab57f Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 4 Apr 2013 03:02:06 +0200 Subject: [PATCH 2/2] unix: include uv.h in src/version.c Include uv.h so the compiler sees the right visibility attribute for uv_version() and uv_version_string(). GYP builds compile with -fvisibility=hidden. Before this commit, the symbols were not visible in libuv.so. Fixes joyent/node#5213. --- src/version.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/version.c b/src/version.c index 6984055a..8091f963 100644 --- a/src/version.c +++ b/src/version.c @@ -19,6 +19,7 @@ * IN THE SOFTWARE. */ +#include "uv.h" /* * Versions with an even minor version (e.g. 0.6.1 or 1.0.4) are API and ABI @@ -26,6 +27,9 @@ * releases. */ +#undef UV_VERSION_MAJOR /* TODO(bnoordhuis) Remove in v0.11. */ +#undef UV_VERSION_MINOR /* TODO(bnoordhuis) Remove in v0.11. */ + #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 #define UV_VERSION_PATCH 4