From a63d9581cc6519d9e756a9b56a41f7269af41a8a Mon Sep 17 00:00:00 2001 From: Makoto Kato Date: Thu, 6 Oct 2016 15:53:11 +0900 Subject: [PATCH] Bug 1307723 - Use USE_CLOCK_API on Android 64-bit. r=terrence MozReview-Commit-ID: GTPaqSbkh9T --- js/src/threading/posix/ConditionVariable.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/src/threading/posix/ConditionVariable.cpp b/js/src/threading/posix/ConditionVariable.cpp index 9262ec879e3d..35a90c604cef 100644 --- a/js/src/threading/posix/ConditionVariable.cpp +++ b/js/src/threading/posix/ConditionVariable.cpp @@ -23,8 +23,9 @@ using mozilla::TimeStamp; static const long NanoSecPerSec = 1000000000; -// Android & macOS 10.12 has the clock functions, but not pthread_condattr_setclock. -#if defined(HAVE_CLOCK_MONOTONIC) && !defined(__ANDROID__) && !defined(__APPLE__) +// Android 32-bit & macOS 10.12 has the clock functions, but not pthread_condattr_setclock. +#if defined(HAVE_CLOCK_MONOTONIC) && \ + !(defined(__ANDROID__) && !defined(__LP64__)) && !defined(__APPLE__) # define USE_CLOCK_API #endif