diff --git a/libcxx/include/__config b/libcxx/include/__config index 8bc9e49e9b350b375272249a338abc78de16b1be..887ca8573a691932a5e47d7bc8d63067f9e3c03e 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -933,6 +933,10 @@ _LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_END_NAMESPACE_STD # if _LIBCPP_GLIBC_PREREQ(2, 30) # define _LIBCPP_HAS_COND_CLOCKWAIT # endif +# elif defined(__OHOS_FAMILY__) // OHOS_LOCAL +# if defined(_LIBCPP_HAS_MUSL_LIBC) +# define _LIBCPP_HAS_COND_CLOCKWAIT +# endif # endif # endif diff --git a/libcxx/include/__mutex_base b/libcxx/include/__mutex_base index ac0d090b7d1944578d747fcc44c7e102f2c55b70..9fa1404cbd086e5302d198dc45cca3de9651db14 100644 --- a/libcxx/include/__mutex_base +++ b/libcxx/include/__mutex_base @@ -327,7 +327,7 @@ private: void __do_timed_wait(unique_lock& __lk, chrono::time_point) _NOEXCEPT; #if defined(_LIBCPP_HAS_COND_CLOCKWAIT) - void __do_timed_wait(unique_lock& __lk, + _LIBCPP_HIDE_FROM_ABI void __do_timed_wait(unique_lock& __lk, chrono::time_point) _NOEXCEPT; #endif template