[libcxx] r216975 - Don't #define _LIBCPP_HAS_NO_MONOTONIC_CLOCK on __APPLE__

Jonathan Roelofs jonathan at codesourcery.com
Tue Sep 2 14:56:01 PDT 2014


Author: jroelofs
Date: Tue Sep  2 16:56:01 2014
New Revision: 216975

URL: http://llvm.org/viewvc/llvm-project?rev=216975&view=rev
Log:
Don't #define _LIBCPP_HAS_NO_MONOTONIC_CLOCK on __APPLE__

This fixes PR20839, which was a bug in r216949.

Modified:
    libcxx/trunk/include/__config

Modified: libcxx/trunk/include/__config
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__config?rev=216975&r1=216974&r2=216975&view=diff
==============================================================================
--- libcxx/trunk/include/__config (original)
+++ libcxx/trunk/include/__config Tue Sep  2 16:56:01 2014
@@ -650,8 +650,9 @@ template <unsigned> struct __static_asse
 #  define _LIBCPP_TRIVIAL_PAIR_COPY_CTOR 1
 #endif
 
-#if (!defined(_POSIX_TIMERS) || _POSIX_TIMERS <= 0) || \
-    (!defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK <= 0)
+#if !defined(__APPLE__) && \
+    ((!defined(_POSIX_TIMERS) || _POSIX_TIMERS <= 0) || \
+     (!defined(_POSIX_MONOTONIC_CLOCK) || _POSIX_MONOTONIC_CLOCK <= 0))
 #define _LIBCPP_HAS_NO_MONOTONIC_CLOCK
 #endif
 





More information about the cfe-commits mailing list