From f35674fe7f9560a5cc39c99e6d396cdcfda1ecfe Mon Sep 17 00:00:00 2001 From: Chris Araman Date: Fri, 27 Jan 2017 13:15:54 -0800 Subject: [PATCH] Revert "darwin: use clock_gettime in macOS 10.12" This reverts commit f8d4805087944cb8543d98109f5f83f4938eb4b5, which causes run-time link errors when compiled with macOS 10.12 SDK, but run on 10.11 or earlier. Refs: https://github.com/libuv/libuv/pull/1073 PR-URL: https://github.com/libuv/libuv/pull/1202 Reviewed-By: Colin Ihrig --- src/unix/darwin.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/unix/darwin.c b/src/unix/darwin.c index b1ffbc37..cf95da21 100644 --- a/src/unix/darwin.c +++ b/src/unix/darwin.c @@ -34,12 +34,8 @@ #include /* _NSGetExecutablePath */ #include #include -#include #include /* 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 }