commit 9b828adfad09200f3f1bd3602187fe3dd5335774
author Elliott Hughes <enh@google.com> Thu Jul 30 08:47:35 2015 -0700
committer Elliott Hughes <enh@google.com> Thu Jul 30 09:33:43 2015 -0700
tree dbea9a10676206346b39e428e74ee630a1a71219
parent dcf890914c7571d3068046b9df1f672e9f45b4d2

Use __ANDROID__ instead of HAVE_ANDROID_OS.

Change-Id: I9967f3fd758c2a5b40be5b60ae72be7e2fb75136

include/utils/Mutex.h

diff --git a/include/utils/Mutex.h b/include/utils/Mutex.h
index 757519b..f027c79 100644
--- a/include/utils/Mutex.h
+++ b/include/utils/Mutex.h
@@ -59,7 +59,7 @@
     // lock if possible; returns 0 on success, error otherwise
     status_t    tryLock();
 
-#if HAVE_ANDROID_OS
+#if defined(__ANDROID__)
     // lock the mutex, but don't wait longer than timeoutMilliseconds.
     // Returns 0 on success, TIMED_OUT for failure due to timeout expiration.
     //
@@ -128,7 +128,7 @@
 inline status_t Mutex::tryLock() {
     return -pthread_mutex_trylock(&mMutex);
 }
-#if HAVE_ANDROID_OS
+#if defined(__ANDROID__)
 inline status_t Mutex::timedLock(nsecs_t timeoutNs) {
     const struct timespec ts = {
         /* .tv_sec = */ static_cast<time_t>(timeoutNs / 1000000000),