am c555476e: am 1972955e: am 99775d87: Merge "Use the more portable <elf.h> instead of <sys/exec_elf.h>."

* commit 'c555476e4a9947b1ce2e5c4668d68d422166bdfa': Use the more portable <elf.h> instead of <sys/exec_elf.h>.
2014-01-10 23:03:11 +00:00 · 2014-01-10 23:03:11 +00:00 · 7fd0ea9bb1
parent 58c4a7ddf2 c555476e4a
commit 7fd0ea9bb1
3 changed files with 3 additions and 3 deletions
--- a/debuggerd/debuggerd.c
+++ b/debuggerd/debuggerd.c
@ -27,7 +27,7 @@

 #include <sys/ptrace.h>
 #include <sys/wait.h>
-#include <sys/exec_elf.h>
+#include <elf.h>
 #include <sys/stat.h>
 #include <sys/poll.h>

--- a/libcorkscrew/arch-arm/backtrace-arm.c
+++ b/libcorkscrew/arch-arm/backtrace-arm.c
@ -59,7 +59,7 @@
 #include <limits.h>
 #include <errno.h>
 #include <sys/ptrace.h>
-#include <sys/exec_elf.h>
+#include <elf.h>
 #include <cutils/log.h>

 #if !defined(__BIONIC_HAVE_UCONTEXT_T)
--- a/libcorkscrew/arch-arm/ptrace-arm.c
+++ b/libcorkscrew/arch-arm/ptrace-arm.c
@ -19,7 +19,7 @@

 #include "../ptrace-arch.h"

-#include <sys/exec_elf.h>
+#include <elf.h>
 #include <cutils/log.h>

 #ifndef PT_ARM_EXIDX