commit | ae91334dbc61e4edf8be52d1e1a7c17f31da455b | [log] [tgz] |
---|---|---|
author | Ian Rogers <irogers@google.com> | Mon Oct 15 17:33:58 2012 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Oct 15 17:33:59 2012 -0700 |
tree | d4e9de147811dd6e93a336a41436578c365ab959 | |
parent | 5438ad85f97c5f7fe030a490fd98841a34d3c961 [diff] | |
parent | 4c54e722f697c3a3c98999f1627e87c280c5b23a [diff] |
Merge "Fix mac build." into dalvik-dev
diff --git a/src/mutex.cc b/src/mutex.cc index 18dc863..cbf115e 100644 --- a/src/mutex.cc +++ b/src/mutex.cc
@@ -104,7 +104,15 @@ int64_t endSec; if (absolute) { +#if !defined(__APPLE__) clock_gettime(clock, ts); +#else + UNUSED(clock); + timeval tv; + gettimeofday(&tv, NULL); + ts->tv_sec = tv.tv_sec; + ts->tv_nsec = tv.tv_usec * 1000; +#endif } else { ts->tv_sec = 0; ts->tv_nsec = 0;