commit 01c2b053aa74d9bd461a29e0c252f7a8ce3f115a
author Mathieu Chartier <mathieuc@google.com> Tue Jul 14 17:10:32 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 14 17:10:33 2015 +0000
tree bc6225b429352e38c5621f0aaa77899692961c2c
parent 68953ebf53e3ef7e0fd2c5beadfa7a2437eebc60
parent 19af117525f37607fc866e3375ef1450e3f5ae35

Merge "Fix mac build"

runtime/thread_list.cc

diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 386f81f..7c40eb7 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -585,8 +585,10 @@
 
   // Wait for the barrier to be passed by all runnable threads. This wait
   // is done with a timeout so that we can detect problems.
+#if ART_USE_FUTEXES
   timespec wait_timeout;
   InitTimeSpec(true, CLOCK_MONOTONIC, 10000, 0, &wait_timeout);
+#endif
   while (true) {
     int32_t cur_val = pending_threads.LoadRelaxed();
     if (LIKELY(cur_val > 0)) {