commit f761709a8e0f440afbdcd0df8f78d5e8ebc94211
author Elliott Hughes <enh@google.com> Tue Jul 08 18:43:12 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 08 18:43:12 2014 +0000
tree a8454c982f7f1f735273896adf91fbb3bd1e9484
parent 4f27968f988808c713564de99c04612b9e8768b9
parent 1829b14cd5887d510d8aedfc1a5b9fa636219525

am 1829b14c: am 18e754ee: Merge "Fix LP64 tombstone.cpp build failure."

* commit '1829b14cd5887d510d8aedfc1a5b9fa636219525':
  Fix LP64 tombstone.cpp build failure.

debuggerd/tombstone.cpp

diff --git a/debuggerd/tombstone.cpp b/debuggerd/tombstone.cpp
index 2bb9efd..f41166b 100755
--- a/debuggerd/tombstone.cpp
+++ b/debuggerd/tombstone.cpp
@@ -329,7 +329,7 @@
 }
 
 static void dump_map(log_t* log, const backtrace_map_t* map, bool fault_addr) {
-  _LOG(log, logtype::MAPS, "%s%" PRIPTR "-%" PRIPTR " %c%c%c  %7d  %s\n",
+  _LOG(log, logtype::MAPS, "%s%" PRIPTR "-%" PRIPTR " %c%c%c  %7" PRIdPTR "  %s\n",
          (fault_addr? "--->" : "    "), map->start, map->end - 1,
          (map->flags & PROT_READ) ? 'r' : '-', (map->flags & PROT_WRITE) ? 'w' : '-',
          (map->flags & PROT_EXEC) ? 'x' : '-',