diff options
| author | Saúl Ibarra Corretgé <saghul@gmail.com> | 2016-05-17 00:25:23 +0200 |
|---|---|---|
| committer | Evan Lucas <evanlucas@me.com> | 2016-05-17 08:35:22 -0500 |
| commit | 2d84ac735af33a4503acae2860bd28621339e45e (patch) | |
| tree | 4eccbd6d4cf6f71553d88a9d36b8b8ce24093834 /deps/uv/include/uv-unix.h | |
| parent | 1b71231dd292ff7de9533c950b0f97e7730095fc (diff) | |
| download | node-new-2d84ac735af33a4503acae2860bd28621339e45e.tar.gz | |
deps: upgrade libuv to 1.9.1
Fixes: https://github.com/nodejs/node/issues/4002
Fixes: https://github.com/nodejs/node/issues/5384
Fixes: https://github.com/nodejs/node/issues/6563
Refs: https://github.com/nodejs/node/issues/2680#issuecomment-213521708
PR-URL: https://github.com/nodejs/node/pull/6796
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/uv/include/uv-unix.h')
| -rw-r--r-- | deps/uv/include/uv-unix.h | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/deps/uv/include/uv-unix.h b/deps/uv/include/uv-unix.h index 82d193bdca..a852c40e49 100644 --- a/deps/uv/include/uv-unix.h +++ b/deps/uv/include/uv-unix.h @@ -38,9 +38,6 @@ #include <semaphore.h> #include <pthread.h> -#ifdef __ANDROID__ -#include "pthread-fixes.h" -#endif #include <signal.h> #include "uv-threadpool.h" @@ -60,6 +57,10 @@ # include "uv-bsd.h" #endif +#ifndef PTHREAD_BARRIER_SERIAL_THREAD +# include "pthread-barrier.h" +#endif + #ifndef NI_MAXHOST # define NI_MAXHOST 1025 #endif @@ -136,22 +137,8 @@ typedef pthread_rwlock_t uv_rwlock_t; typedef UV_PLATFORM_SEM_T uv_sem_t; typedef pthread_cond_t uv_cond_t; typedef pthread_key_t uv_key_t; - -#if defined(__APPLE__) && defined(__MACH__) - -typedef struct { - unsigned int n; - unsigned int count; - uv_mutex_t mutex; - uv_sem_t turnstile1; - uv_sem_t turnstile2; -} uv_barrier_t; - -#else /* defined(__APPLE__) && defined(__MACH__) */ - typedef pthread_barrier_t uv_barrier_t; -#endif /* defined(__APPLE__) && defined(__MACH__) */ /* Platform-specific definitions for uv_spawn support. */ typedef gid_t uv_gid_t; |