Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-06-27 21:51:39 +08:00
commit d55284684f
560 changed files with 108953 additions and 52721 deletions

View file

@ -19,8 +19,7 @@ using base::TimeDelta;
ConditionVariable::ConditionVariable(Lock* user_lock)
: user_mutex_(user_lock->lock_impl()->os_lock()) {
int rv = 0;
#if !defined(OS_MACOSX) && \
!(defined(OS_ANDROID) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC))
#if !defined(OS_MACOSX)
pthread_condattr_t attrs;
rv = pthread_condattr_init(&attrs);
DCHECK_EQ(0, rv);