diff options
| author | Moonchild <moonchild@palemoon.org> | 2021-10-17 17:19:41 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-01 15:47:43 +0200 |
| commit | ce0cefe0534a01af0a055a0a781d898e8b9f18ca (patch) | |
| tree | 9a855f8e126937ef84352d01bacda2b34fb1c130 /ipc/chromium/src/base/condition_variable_posix.cc | |
| parent | 35e71030933059c0c312ec2dc35c616e31a3af75 (diff) | |
| download | uxp-ce0cefe0534a01af0a055a0a781d898e8b9f18ca.tar.gz | |
Issue #1053 - Second pass remove android defines and build system stuff.
Mostly IPC, tools and mozbuild.
Diffstat (limited to 'ipc/chromium/src/base/condition_variable_posix.cc')
| -rw-r--r-- | ipc/chromium/src/base/condition_variable_posix.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/ipc/chromium/src/base/condition_variable_posix.cc b/ipc/chromium/src/base/condition_variable_posix.cc index 59e919d697..f39c2d3685 100644 --- a/ipc/chromium/src/base/condition_variable_posix.cc +++ b/ipc/chromium/src/base/condition_variable_posix.cc @@ -20,7 +20,7 @@ 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)) + defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC)) pthread_condattr_t attrs; rv = pthread_condattr_init(&attrs); DCHECK_EQ(0, rv); @@ -68,12 +68,7 @@ void ConditionVariable::TimedWait(const TimeDelta& max_time) { absolute_time.tv_nsec %= Time::kNanosecondsPerSecond; DCHECK_GE(absolute_time.tv_sec, now.tv_sec); // Overflow paranoia -#if defined(OS_ANDROID) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC) - int rv = pthread_cond_timedwait_monotonic_np( - &condition_, user_mutex_, &absolute_time); -#else int rv = pthread_cond_timedwait(&condition_, user_mutex_, &absolute_time); -#endif // OS_ANDROID && HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC #endif // OS_MACOSX DCHECK(rv == 0 || rv == ETIMEDOUT); |