diff options
| author | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-02 21:56:01 +0000 |
|---|---|---|
| committer | Jonathan Roelofs <jonathan@codesourcery.com> | 2014-09-02 21:56:01 +0000 |
| commit | f4bc679cad1d1d6b7b4feadb36476ed1e40ba5c8 (patch) | |
| tree | 78aefada4761cf113227e6b27e724eba81e84182 /libcxx/include/__config | |
| parent | 3b84f59b6bdf4ce57767aae4825788dba04e106f (diff) | |
| download | bcm5719-llvm-f4bc679cad1d1d6b7b4feadb36476ed1e40ba5c8.tar.gz bcm5719-llvm-f4bc679cad1d1d6b7b4feadb36476ed1e40ba5c8.zip | |
Don't #define _LIBCPP_HAS_NO_MONOTONIC_CLOCK on __APPLE__
This fixes PR20839, which was a bug in r216949.
llvm-svn: 216975
Diffstat (limited to 'libcxx/include/__config')
| -rw-r--r-- | libcxx/include/__config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index 2eb9e55f9c1..6347b51fa32 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -650,8 +650,9 @@ template <unsigned> struct __static_assert_check {}; # 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 |
