commit | 670e8d6e3af81cbb8e7fd453cbc7f74fe926f45e | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri Oct 19 17:40:51 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Oct 19 17:40:52 2012 -0700 |
tree | 33a774882cde94f33aeec1683466e0c795dd6863 | |
parent | aed8e8da3bd0ad57330d06d8517a3289029ddfe2 [diff] | |
parent | 27913a2a409f0489f7360704f54fb23dfbc7e3a5 [diff] |
Merge "Fix for Mac build." into dalvik-dev
diff --git a/src/mutex.cc b/src/mutex.cc index cbf115e..ec0752e 100644 --- a/src/mutex.cc +++ b/src/mutex.cc
@@ -29,6 +29,8 @@ #if defined(__APPLE__) #include "AvailabilityMacros.h" // For MAC_OS_X_VERSION_MAX_ALLOWED +// No clocks to specify on OS/X, fake value to pass to routines that require a clock. +#define CLOCK_REALTIME 0xEBADFOOD #endif #define CHECK_MUTEX_CALL(call, args) CHECK_PTHREAD_CALL(call, args, name_)