From 633d33a92a4004938b8a88f661571c3fc93085db Mon Sep 17 00:00:00 2001 From: mscdex Date: Wed, 10 Apr 2013 11:36:13 -0400 Subject: [PATCH 1/4] cygwin: remove unused variable --- src/unix/cygwin.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/unix/cygwin.c b/src/unix/cygwin.c index 9ee520d7..dcd9d6dd 100644 --- a/src/unix/cygwin.c +++ b/src/unix/cygwin.c @@ -55,8 +55,6 @@ void uv_loadavg(double avg[3]) { int uv_exepath(char* buffer, size_t* size) { - uint32_t usize; - if (!buffer || !size) { return -1; } From 0ff06b4ac38a3d53c32e52b2c649dd2d4b3d2b0c Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 10 Apr 2013 23:40:55 +0200 Subject: [PATCH 2/4] build: -Wno-dollar-in-identifier-extension is clang only Add a compiler check because turning on the option unconditionally breaks the build when CC=gcc. This should also fix the build on versions of OS X that predate Apple's switch to clang (10.6 and older.) --- config-unix.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config-unix.mk b/config-unix.mk index 50695d75..ae510a33 100644 --- a/config-unix.mk +++ b/config-unix.mk @@ -80,8 +80,12 @@ endif ifeq (darwin,$(PLATFORM)) HAVE_DTRACE=1 -# dtrace(1) probes contain dollar signs. +# dtrace(1) probes contain dollar signs on OS X. Mute the warnings they +# generate but only when CC=clang, -Wno-dollar-in-identifier-extension +# is a clang extension. +ifeq (__clang__,$(shell sh -c "$(CC) -dM -E - Date: Thu, 11 Apr 2013 09:00:06 -0700 Subject: [PATCH 3/4] 2013.04.12, Version 0.10.4 (Stable) Changes since version 0.10.3: * include: update uv_backend_fd() documentation (Ben Noordhuis) * unix: include uv.h in src/version.c (Ben Noordhuis) * unix: don't write more than IOV_MAX iovecs (Fedor Indutny) * mingw-w64: don't call _set_invalid_parameter_handler (Nils Maier) * build: gyp disable thin archives (Timothy J. Fontaine) * sunos: re-export entire library when static (Timothy J. Fontaine) * unix: dtrace probes for tick-start and tick-stop (Timothy J. Fontaine) * windows: fix memory leak in fs__sendfile (Shannen Saez) * windows: remove double initialization in uv_tty_init (Shannen Saez) * build: fix dtrace-enabled out of tree build (Ben Noordhuis) * build: squelch -Wdollar-in-identifier-extension warnings (Ben Noordhuis) * inet: snprintf returns int, not size_t (Brian White) * win: refactor uv_cpu_info (Bert Belder) * build: add support for Visual Studio 2012 (Nicholas Vavilov) * build: -Wno-dollar-in-identifier-extension is clang only (Ben Noordhuis) --- .mailmap | 1 + AUTHORS | 2 ++ ChangeLog | 35 +++++++++++++++++++++++++++++++++++ src/version.c | 2 +- 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/.mailmap b/.mailmap index 560a6500..5dc4075e 100644 --- a/.mailmap +++ b/.mailmap @@ -2,6 +2,7 @@ Alan Gutierrez Bert Belder Bert Belder Brandon Philips +Brian White Brian White Frank Denis Isaac Z. Schlueter diff --git a/AUTHORS b/AUTHORS index 435f7342..70ee0ea3 100644 --- a/AUTHORS +++ b/AUTHORS @@ -79,3 +79,5 @@ Tim Bradshaw Timothy J. Fontaine Marc Schlaich Brian Mazza +Nils Maier +Nicholas Vavilov diff --git a/ChangeLog b/ChangeLog index ff267955..eaa00290 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +2013.04.12, Version 0.10.4 (Stable) + +Changes since version 0.10.3: + +* include: update uv_backend_fd() documentation (Ben Noordhuis) + +* unix: include uv.h in src/version.c (Ben Noordhuis) + +* unix: don't write more than IOV_MAX iovecs (Fedor Indutny) + +* mingw-w64: don't call _set_invalid_parameter_handler (Nils Maier) + +* build: gyp disable thin archives (Timothy J. Fontaine) + +* sunos: re-export entire library when static (Timothy J. Fontaine) + +* unix: dtrace probes for tick-start and tick-stop (Timothy J. Fontaine) + +* windows: fix memory leak in fs__sendfile (Shannen Saez) + +* windows: remove double initialization in uv_tty_init (Shannen Saez) + +* build: fix dtrace-enabled out of tree build (Ben Noordhuis) + +* build: squelch -Wdollar-in-identifier-extension warnings (Ben Noordhuis) + +* inet: snprintf returns int, not size_t (Brian White) + +* win: refactor uv_cpu_info (Bert Belder) + +* build: add support for Visual Studio 2012 (Nicholas Vavilov) + +* build: -Wno-dollar-in-identifier-extension is clang only (Ben Noordhuis) + + 2013.02.04, Version 0.10.3 (Stable) Changes since version 0.10.2: diff --git a/src/version.c b/src/version.c index 8091f963..3388c71b 100644 --- a/src/version.c +++ b/src/version.c @@ -33,7 +33,7 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 #define UV_VERSION_PATCH 4 -#define UV_VERSION_IS_RELEASE 0 +#define UV_VERSION_IS_RELEASE 1 #define UV_VERSION ((UV_VERSION_MAJOR << 16) | \ From 5ed1d02cc0167704710d1dd4aafd26653eaf810f Mon Sep 17 00:00:00 2001 From: isaacs Date: Thu, 11 Apr 2013 09:00:10 -0700 Subject: [PATCH 4/4] Now working on v0.10.5 --- ChangeLog | 6 +++--- src/version.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index eaa00290..12da5e13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2013.04.12, Version 0.10.4 (Stable) +2013.04.12, Version 0.10.4 (Stable), 85827e26403ac6dfa331af8ec9916ea7e27bd833 Changes since version 0.10.3: @@ -33,7 +33,7 @@ Changes since version 0.10.3: * build: -Wno-dollar-in-identifier-extension is clang only (Ben Noordhuis) -2013.02.04, Version 0.10.3 (Stable) +2013.02.04, Version 0.10.3 (Stable), 31ebe23973dd98fd8a24c042b606f37a794e99d0 Changes since version 0.10.2: @@ -50,7 +50,7 @@ Changes since version 0.10.2: * unix: don't clear flags after closing UDP handle (Saúl Ibarra Corretgé) -2013.03.25, Version 0.10.2 (Stable) +2013.03.25, Version 0.10.2 (Stable), 0f36a00568f3e7608f97f6c6cdb081f4800a50c9 This is the first officially versioned release of libuv. Starting now libuv will make releases independently of Node.js. diff --git a/src/version.c b/src/version.c index 3388c71b..ed2c07ab 100644 --- a/src/version.c +++ b/src/version.c @@ -32,8 +32,8 @@ #define UV_VERSION_MAJOR 0 #define UV_VERSION_MINOR 10 -#define UV_VERSION_PATCH 4 -#define UV_VERSION_IS_RELEASE 1 +#define UV_VERSION_PATCH 5 +#define UV_VERSION_IS_RELEASE 0 #define UV_VERSION ((UV_VERSION_MAJOR << 16) | \