Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c555476e authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '1972955e':
  Use the more portable <elf.h> instead of <sys/exec_elf.h>.
parents e3cd2168 1972955e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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>

+1 −1
Original line number Diff line number Diff line
@@ -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)
+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@

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

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

#ifndef PT_ARM_EXIDX