diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-08 18:00:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-08 18:00:51 +0000 |
| commit | 322d2dc2641ccb3ed2acfd6170fae0f3f92ea853 (patch) | |
| tree | 76ed9af76b686460dc263a529e1100c05a913ec1 | |
| parent | ad3127a529a20eda5fcb8dfd02aa5406a14ccf99 (diff) | |
| parent | 4776e2e4322b072d278e0ace012a770758973de8 (diff) | |
| download | system_core-322d2dc2641ccb3ed2acfd6170fae0f3f92ea853.zip system_core-322d2dc2641ccb3ed2acfd6170fae0f3f92ea853.tar.gz system_core-322d2dc2641ccb3ed2acfd6170fae0f3f92ea853.tar.bz2 | |
am 4776e2e4: am 1f64d7e1: am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."
* commit '4776e2e4322b072d278e0ace012a770758973de8':
Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
| -rw-r--r-- | debuggerd/mips/machine.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/debuggerd/mips/machine.cpp b/debuggerd/mips/machine.cpp index 7b4e29e..ab34182 100644 --- a/debuggerd/mips/machine.cpp +++ b/debuggerd/mips/machine.cpp @@ -22,8 +22,6 @@ #include <sys/types.h> #include <sys/ptrace.h> -#include <corkscrew/ptrace.h> - #include <sys/user.h> #include "../utility.h" @@ -37,7 +35,7 @@ // If configured to do so, dump memory around *all* registers // for the crashing thread. void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) { - pt_regs_mips_t r; + pt_regs r; if (ptrace(PTRACE_GETREGS, tid, 0, &r)) { return; } @@ -80,7 +78,7 @@ void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) { } void dump_registers(log_t* log, pid_t tid, int scope_flags) { - pt_regs_mips_t r; + pt_regs r; if(ptrace(PTRACE_GETREGS, tid, 0, &r)) { _LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno)); return; |