diff options
| author | 2018-04-17 18:13:41 +0000 | |
|---|---|---|
| committer | 2018-04-17 18:13:41 +0000 | |
| commit | d12cd04146e4d6326eb1adcfd6161bd9f69f09e2 (patch) | |
| tree | 80016f9a2edd1eaf0d6a3ae4da05d8a975da20b0 | |
| parent | e83bae5c62c7e739e18cafa1126a727b4788895c (diff) | |
| parent | b4dfca56fbf5a2c3612732568dce4d200b626a3a (diff) | |
Merge "The test for futex support should be a test for Linux"
| -rw-r--r-- | runtime/base/mutex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/base/mutex.h b/runtime/base/mutex.h index b0eb23d327..1cf4ddded4 100644 --- a/runtime/base/mutex.h +++ b/runtime/base/mutex.h @@ -31,10 +31,10 @@ #include "base/globals.h" #include "base/macros.h" -#if defined(__APPLE__) -#define ART_USE_FUTEXES 0 -#else +#if defined(__linux__) #define ART_USE_FUTEXES 1 +#else +#define ART_USE_FUTEXES 0 #endif // Currently Darwin doesn't support locks with timeouts. |