diff options
author | Elliott Hughes <enh@google.com> | 2015-03-10 15:03:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-10 15:03:41 +0000 |
commit | 1f909334507e6f4c0db20a71a4fceb0397c6ee7d (patch) | |
tree | 8c990ec518dc9510cc4594e5f3789f9cdd1f4b21 /toolbox | |
parent | 8576aa055ca9278d454ef5261032ecfd542badd4 (diff) | |
parent | ed5b81c9e59c0a6c618f43964a4a2639448c0686 (diff) | |
download | system_core-1f909334507e6f4c0db20a71a4fceb0397c6ee7d.zip system_core-1f909334507e6f4c0db20a71a4fceb0397c6ee7d.tar.gz system_core-1f909334507e6f4c0db20a71a4fceb0397c6ee7d.tar.bz2 |
am ed5b81c9: Merge "Fix LP32 build."
* commit 'ed5b81c9e59c0a6c618f43964a4a2639448c0686':
Fix LP32 build.
Diffstat (limited to 'toolbox')
-rw-r--r-- | toolbox/ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/toolbox/ps.c b/toolbox/ps.c index 18129ff..cf3f05a 100644 --- a/toolbox/ps.c +++ b/toolbox/ps.c @@ -1,6 +1,7 @@ #include <ctype.h> #include <dirent.h> #include <fcntl.h> +#include <inttypes.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> @@ -192,7 +193,7 @@ static int ps_line(int pid, int tid, char *namefilter) wchan[wchan_len = 0] = '\0'; } close(fd); - printf(" %10.*s %0*lx %s ", (int) wchan_len, wchan, (int) PC_WIDTH, eip, state); + printf(" %10.*s %0*" PRIxPTR " %s ", (int) wchan_len, wchan, (int) PC_WIDTH, eip, state); if (display_flags & SHOW_ABI) { print_exe_abi(pid); } |