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

Commit 413001aa authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am 3a49aa7b: am 9428a289: Merge "Only include ucontext.h when necessary."

* commit '3a49aa7b':
  Only include ucontext.h when necessary.
parents f4e28c39 3a49aa7b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@
#include <string.h>
#include <sys/ptrace.h>
#include <sys/types.h>
#include <ucontext.h>
#include <unistd.h>

#include <string>
+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@
#include <backtrace/BacktraceMap.h>

#include <sys/types.h>
#include <ucontext.h>

class BacktraceImpl {
public:
+1 −1
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@
 * limitations under the License.
 */

#include <sys/ucontext.h>
#include <sys/types.h>
#include <ucontext.h>

#include <backtrace/Backtrace.h>
#include <backtrace/BacktraceMap.h>
+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@

#include <sys/types.h>
#include <string.h>
#include <ucontext.h>

#include <libunwind.h>
#include <libunwind-ptrace.h>