From: Michael Lee <mzlee@fb.com>
Date: Tue, 14 Jun 2016 00:50:11 +0000 (-0700)
Subject: Reverted commit D3427621
X-Git-Tag: 2016.07.26~143
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=f5bdf4a39f94fe31c2eacb72c8b0725c28406076

Reverted commit D3427621

Summary: The iOS sdk adds `clock_gettime` support.

Reviewed By: clementgenzmer

Differential Revision: D3427621

fbshipit-source-id: 534276ba1e0ade185e3af0665f419f3c51d3f980
---

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 <folly/portability/Time.h>
 
 #if !FOLLY_HAVE_CLOCK_GETTIME
-#if __MACH__ && !defined(__CLOCK_AVAILABILITY)
+#if __MACH__
 #include <errno.h>
 #include <mach/mach_time.h>
 
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 <folly/portability/Config.h>
 
-// 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.