commit fdb7308bb75e503486be134103d1260aadec8cae
author Elliott Hughes <enh@google.com> Mon Aug 06 13:15:15 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Aug 06 13:15:16 2012 -0700
tree 336339c91df9091d4905bb7b36340954451b30b4
parent 78f6f9b1f34e543e0806cfb0393e29b1e39ae84f
parent ac8ed5e0893043a91a08e7fbf840fd3eff38a188

Merge "Use uintptr_t for cast pointer to integer."

tools/jdwpspy/Main.cpp

diff --git a/tools/jdwpspy/Main.cpp b/tools/jdwpspy/Main.cpp
index 0f68d52..b53f99b 100644
--- a/tools/jdwpspy/Main.cpp
+++ b/tools/jdwpspy/Main.cpp
@@ -7,6 +7,7 @@
 #include "Common.h"
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <string.h>
 #include <assert.h>
 #include <ctype.h>
@@ -35,7 +36,7 @@
 {
     const unsigned char* addr = reinterpret_cast<const unsigned char*>(vaddr);
     char out[77];       /* exact fit */
-    unsigned int offset;    /* offset to show while printing */
+    uintptr_t offset;   /* offset to show while printing */
     char* hex;
     char* asc;
     int gap;
@@ -43,7 +44,7 @@
     if (mode == kHexDumpLocal)
         offset = 0;
     else
-        offset = (int) addr;
+        offset = (uintptr_t) addr;
 
     memset(out, ' ', sizeof(out)-1);
     out[8] = ':';