diff options
| author | Christopher Ferris <cferris@google.com> | 2014-06-04 00:17:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-04 00:17:54 +0000 |
| commit | a8a7f001f142a77a2c406455ace4a8c00e692111 (patch) | |
| tree | 31363be3158f4f9a677d999e6ca79491f70323a2 | |
| parent | ddde05f3eec76513ae5d973a1c5d69494349f082 (diff) | |
| parent | 3520086e3dac6ce33b94139811f34e22226bbe16 (diff) | |
| download | system_core-a8a7f001f142a77a2c406455ace4a8c00e692111.zip system_core-a8a7f001f142a77a2c406455ace4a8c00e692111.tar.gz system_core-a8a7f001f142a77a2c406455ace4a8c00e692111.tar.bz2 | |
Merge "Fix x86 and x86_64 builds."
| -rw-r--r-- | debuggerd/x86/machine.cpp | 2 | ||||
| -rwxr-xr-x | debuggerd/x86_64/machine.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/debuggerd/x86/machine.cpp b/debuggerd/x86/machine.cpp index 141f19a..bcc217e 100644 --- a/debuggerd/x86/machine.cpp +++ b/debuggerd/x86/machine.cpp @@ -25,7 +25,7 @@ #include "../utility.h" #include "../machine.h" -void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) { +void dump_memory_and_code(log_t*, pid_t, int) { } void dump_registers(log_t* log, pid_t tid, int scope_flags) { diff --git a/debuggerd/x86_64/machine.cpp b/debuggerd/x86_64/machine.cpp index 406851a..c8c7aa9 100755 --- a/debuggerd/x86_64/machine.cpp +++ b/debuggerd/x86_64/machine.cpp @@ -27,7 +27,7 @@ #include "../utility.h" #include "../machine.h" -void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) { +void dump_memory_and_code(log_t*, pid_t, int) { } void dump_registers(log_t* log, pid_t tid, int scope_flags) { |