aboutsummaryrefslogtreecommitdiff
path: root/deps/uv/include
diff options
context:
space:
mode:
Diffstat (limited to 'deps/uv/include')
-rw-r--r--deps/uv/include/uv-version.h2
-rw-r--r--deps/uv/include/uv-win.h26
2 files changed, 13 insertions, 15 deletions
diff --git a/deps/uv/include/uv-version.h b/deps/uv/include/uv-version.h
index f4d91e83bd..e1f26601a1 100644
--- a/deps/uv/include/uv-version.h
+++ b/deps/uv/include/uv-version.h
@@ -32,7 +32,7 @@
#define UV_VERSION_MAJOR 1
#define UV_VERSION_MINOR 7
-#define UV_VERSION_PATCH 4
+#define UV_VERSION_PATCH 5
#define UV_VERSION_IS_RELEASE 1
#define UV_VERSION_SUFFIX ""
diff --git a/deps/uv/include/uv-win.h b/deps/uv/include/uv-win.h
index a0b1ef028d..300be47620 100644
--- a/deps/uv/include/uv-win.h
+++ b/deps/uv/include/uv-win.h
@@ -246,22 +246,20 @@ typedef union {
} uv_cond_t;
typedef union {
- /* srwlock_ has type SRWLOCK, but not all toolchains define this type in */
- /* windows.h. */
- SRWLOCK srwlock_;
struct {
- union {
- CRITICAL_SECTION cs;
- /* TODO: remove me in v2.x. */
- uv_mutex_t unused;
- } read_lock_;
- union {
- HANDLE sem;
- /* TODO: remove me in v2.x. */
- uv_mutex_t unused;
- } write_lock_;
unsigned int num_readers_;
- } fallback_;
+ CRITICAL_SECTION num_readers_lock_;
+ HANDLE write_semaphore_;
+ } state_;
+ /* TODO: remove me in v2.x. */
+ struct {
+ SRWLOCK unused_;
+ } unused1_;
+ /* TODO: remove me in v2.x. */
+ struct {
+ uv_mutex_t unused1_;
+ uv_mutex_t unused2_;
+ } unused2_;
} uv_rwlock_t;
typedef struct {