commit a5acfd318d46c4720bb9b25181021ee7471b6be9
author Ian Rogers <irogers@google.com> Wed Aug 15 11:50:10 2012 -0700
committer Ian Rogers <irogers@google.com> Wed Aug 15 14:06:01 2012 -0700
tree 87ba3fc6b98ef3bd531d2e21f05d7efc675055e0
parent 3d71d80626fdc0fe1f61c84bb52e9f7d96c95060

Mac build fix for global lock levels.

Change-Id: Iebaa4509a95de16d606f0325bc9fc77ef72566d3

src/mutex.cc

diff --git a/src/mutex.cc b/src/mutex.cc
index 182f6f0..dc33fbe 100644
--- a/src/mutex.cc
+++ b/src/mutex.cc
@@ -267,7 +267,7 @@
 #elif defined(__GLIBC__)
   return reinterpret_cast<const glibc_pthread_mutex_t*>(&mutex_)->owner;
 #elif defined(__APPLE__)
-  return reinterpret_cast<darwin_pthread_mutex_t*>(&mutex_)->owner_tid;
+  return reinterpret_cast<const darwin_pthread_mutex_t*>(&mutex_)->owner_tid;
 #else
 #error unsupported C library
 #endif
@@ -303,17 +303,25 @@
 }
 
 bool ReaderWriterMutex::ExclusiveLockWithTimeout(const timespec& abs_timeout) {
+  // Check that timeouts are supported. Currently Darwin doesn't support timeouts, if we are
+  // running on Darwin the timeout won't be respected.
+#if defined(_POSIX_TIMEOUTS) && (_POSIX_TIMEOUTS - 200112) >= 0L
   int result = pthread_rwlock_timedwrlock(&rwlock_, &abs_timeout);
   if (result == ETIMEDOUT) {
     return false;
   }
   if (result != 0) {
     errno = result;
-    PLOG(FATAL) << "pthread_mutex_trylock failed for " << name_;
+    PLOG(FATAL) << "pthread_rwlock_timedwrlock failed for " << name_;
   }
   RegisterAsLockedWithCurrentThread();
   AssertSharedHeld();
   return true;
+#else
+  UNUSED(abs_timeout);
+  ExclusiveLock();
+  return true;
+#endif
 }
 
 void ReaderWriterMutex::SharedLock() {