diff options
| author | cjihrig <cjihrig@gmail.com> | 2017-01-31 20:06:00 -0500 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2017-02-09 13:03:09 -0500 |
| commit | 8514269876c4250e885a1b2407cfa7eb92498c0e (patch) | |
| tree | f92827180e842283c68457a714480926032965f2 /deps/uv/src/unix/darwin.c | |
| parent | a4bb9fdb893c8f2c36a6b77862e29b2608e080c2 (diff) | |
| download | android-node-v8-8514269876c4250e885a1b2407cfa7eb92498c0e.tar.gz android-node-v8-8514269876c4250e885a1b2407cfa7eb92498c0e.tar.bz2 android-node-v8-8514269876c4250e885a1b2407cfa7eb92498c0e.zip | |
deps: upgrade libuv to 1.11.0
Fixes: https://github.com/nodejs/node/issues/10165
Fixes: https://github.com/nodejs/node/issues/9856
Fixes: https://github.com/nodejs/node/issues/10607
Fixes: https://github.com/nodejs/node/issues/11104
PR-URL: https://github.com/nodejs/node/pull/11094
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps/uv/src/unix/darwin.c')
| -rw-r--r-- | deps/uv/src/unix/darwin.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/deps/uv/src/unix/darwin.c b/deps/uv/src/unix/darwin.c index b1ffbc37b4..cf95da2169 100644 --- a/deps/uv/src/unix/darwin.c +++ b/deps/uv/src/unix/darwin.c @@ -34,12 +34,8 @@ #include <mach-o/dyld.h> /* _NSGetExecutablePath */ #include <sys/resource.h> #include <sys/sysctl.h> -#include <time.h> #include <unistd.h> /* sysconf */ -#undef NANOSEC -#define NANOSEC ((uint64_t) 1e9) - int uv__platform_loop_init(uv_loop_t* loop) { loop->cf_state = NULL; @@ -57,11 +53,6 @@ void uv__platform_loop_delete(uv_loop_t* loop) { uint64_t uv__hrtime(uv_clocktype_t type) { -#ifdef MAC_OS_X_VERSION_10_12 - struct timespec ts; - clock_gettime(CLOCK_MONOTONIC, &ts); - return (((uint64_t) ts.tv_sec) * NANOSEC + ts.tv_nsec); -#else static mach_timebase_info_data_t info; if ((ACCESS_ONCE(uint32_t, info.numer) == 0 || @@ -70,7 +61,6 @@ uint64_t uv__hrtime(uv_clocktype_t type) { abort(); return mach_absolute_time() * info.numer / info.denom; -#endif } |