chromium/base: Align sync primitives to OS/2.

Neede for #3.
bitwiseworks · Mar 25, 2020 · b831168 · b831168
1 parent 6af2a5b
commit b831168
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/chromium/base/synchronization/condition_variable_posix.cc b/chromium/base/synchronization/condition_variable_posix.cc
@@ -30,7 +30,8 @@ ConditionVariable::ConditionVariable(Lock* user_lock)
   // non-standard pthread_cond_timedwait_monotonic_np. Newer platform
   // versions have pthread_condattr_setclock.
   // Mac can use relative time deadlines.
-#if !defined(OS_MACOSX) && !defined(OS_NACL) && \
+  // OS/2 doesn't support monotonic deadlines either.
+#if !defined(OS_MACOSX) && !defined(OS_OS2) && !defined(OS_NACL) && \
       !(defined(OS_ANDROID) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC))
   pthread_condattr_t attrs;
   rv = pthread_condattr_init(&attrs);
@@ -101,8 +102,8 @@ void ConditionVariable::TimedWait(const TimeDelta& max_time) {
 #else
   // The timeout argument to pthread_cond_timedwait is in absolute time.
   struct timespec absolute_time;
-#if defined(OS_NACL)
-  // See comment in constructor for why this is different in NaCl.
+#if defined(OS_NACL) || defined(OS_OS2)
+  // See comment in constructor for why this is different in NaCl and OS/2.
   struct timeval now;
   gettimeofday(&now, NULL);
   absolute_time.tv_sec = now.tv_sec;

diff --git a/chromium/base/synchronization/lock_impl_posix.cc b/chromium/base/synchronization/lock_impl_posix.cc
@@ -48,7 +48,8 @@ std::string SystemErrorCodeToString(int error_code) {
 // Lock::PriorityInheritanceAvailable still must be checked as the code may
 // compile but the underlying platform still may not correctly support priority
 // inheritance locks.
-#if defined(OS_NACL) || defined(OS_ANDROID) || defined(OS_FUCHSIA)
+#if defined(OS_NACL) || defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
+  defined(OS_OS2)
 #define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 0
 #else
 #define PRIORITY_INHERITANCE_LOCKS_POSSIBLE() 1