diff options
| author | Ian Rogers <irogers@google.com> | 2014-01-23 18:05:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-01-23 18:05:27 +0000 |
| commit | 919743e49fb6301d30910d709e73fbf559de968b (patch) | |
| tree | d21e83248f4ea6f1addb77972c395caad22ba675 /runtime/base | |
| parent | 399b09b8ef9d53769d5084ba1cf0d3e964bb0a1a (diff) | |
| parent | 220228e07dac607d97c8019ceee73d29b28d5100 (diff) | |
| download | art-919743e49fb6301d30910d709e73fbf559de968b.zip art-919743e49fb6301d30910d709e73fbf559de968b.tar.gz art-919743e49fb6301d30910d709e73fbf559de968b.tar.bz2 | |
Merge "64bit cleanliness requires PRI*64 macros for stdint types."
Diffstat (limited to 'runtime/base')
| -rw-r--r-- | runtime/base/mutex-inl.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/base/mutex-inl.h b/runtime/base/mutex-inl.h index 29b3981..30bf623 100644 --- a/runtime/base/mutex-inl.h +++ b/runtime/base/mutex-inl.h @@ -17,6 +17,9 @@ #ifndef ART_RUNTIME_BASE_MUTEX_INL_H_ #define ART_RUNTIME_BASE_MUTEX_INL_H_ +#define __STDC_FORMAT_MACROS 1 +#include <inttypes.h> + #include "mutex.h" #define ATRACE_TAG ATRACE_TAG_DALVIK @@ -96,7 +99,7 @@ class ScopedContentionRecorder { blocked_tid_(kLogLockContentions ? blocked_tid : 0), owner_tid_(kLogLockContentions ? owner_tid : 0), start_nano_time_(kLogLockContentions ? NanoTime() : 0) { - std::string msg = StringPrintf("Lock contention on %s (owner tid: %llu)", + std::string msg = StringPrintf("Lock contention on %s (owner tid: %" PRIu64 ")", mutex->GetName(), owner_tid); ATRACE_BEGIN(msg.c_str()); } |