commit 220228e07dac607d97c8019ceee73d29b28d5100
author Ian Rogers <irogers@google.com> Thu Jan 23 09:08:16 2014 -0800
committer Ian Rogers <irogers@google.com> Thu Jan 23 09:11:41 2014 -0800
tree 4ce227c7fca8453a8eedb0834a5728043766dd95
parent 9d8918fe97c235fdc6eb2c7f2d50a6673ab50329

64bit cleanliness requires PRI*64 macros for stdint types.

Change-Id: I0cdce36d5f875cdc64cd2db22fd8179916ffa10f

runtime/base/mutex-inl.h

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 @@
         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());
   }