From f5bdf4a39f94fe31c2eacb72c8b0725c28406076 Mon Sep 17 00:00:00 2001 From: Michael Lee Date: Mon, 13 Jun 2016 17:50:11 -0700 Subject: [PATCH] Reverted commit D3427621 Summary: The iOS sdk adds `clock_gettime` support. Reviewed By: clementgenzmer Differential Revision: D3427621 fbshipit-source-id: 534276ba1e0ade185e3af0665f419f3c51d3f980 --- folly/portability/Time.cpp | 2 +- folly/portability/Time.h | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/folly/portability/Time.cpp b/folly/portability/Time.cpp index ea6d4ef0..a9160356 100755 --- a/folly/portability/Time.cpp +++ b/folly/portability/Time.cpp @@ -17,7 +17,7 @@ #include #if !FOLLY_HAVE_CLOCK_GETTIME -#if __MACH__ && !defined(__CLOCK_AVAILABILITY) +#if __MACH__ #include #include diff --git a/folly/portability/Time.h b/folly/portability/Time.h index b3dfa688..642a95de 100755 --- a/folly/portability/Time.h +++ b/folly/portability/Time.h @@ -21,11 +21,9 @@ #include -// These aren't generic implementations, so we can only declare them -// on platforms we support. Apple started defining clock_gettime in -// iOS 10 / OSX 12 and is gated via __CLOCK_AVAILABILITY. -#if !FOLLY_HAVE_CLOCK_GETTIME && \ - (defined(_WIN32) || (defined(__MACH__) && !defined(__CLOCK_AVAILABILITY))) +// These aren't generic implementations, so we can only declare them on +// platforms we support. +#if !FOLLY_HAVE_CLOCK_GETTIME && (defined(__MACH__) || defined(_WIN32)) #define CLOCK_REALTIME 0 // The Windows implementation supports a few other // clock types as well. -- 2.34.1