summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-05-22 03:27:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-22 03:27:42 +0000
commit7f8ebb8178cd6a3d9ea0206070682a9b463f15d2 (patch)
tree31c2c6a1af9367b381039a2ae04607e09a30e418
parent4077acd2c4e1efff0ad0942b54077b14859b06c1 (diff)
parent30291f2119be5a8ce3491a715e07f28062532f4d (diff)
downloadsystem_core-7f8ebb8178cd6a3d9ea0206070682a9b463f15d2.zip
system_core-7f8ebb8178cd6a3d9ea0206070682a9b463f15d2.tar.gz
system_core-7f8ebb8178cd6a3d9ea0206070682a9b463f15d2.tar.bz2
am 30291f21: Merge "Add missing headers"
* commit '30291f2119be5a8ce3491a715e07f28062532f4d': Add missing headers
-rw-r--r--include/backtrace/BacktraceMap.h1
-rw-r--r--libbacktrace/UnwindMap.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/include/backtrace/BacktraceMap.h b/include/backtrace/BacktraceMap.h
index 13083bd..c717f09 100644
--- a/include/backtrace/BacktraceMap.h
+++ b/include/backtrace/BacktraceMap.h
@@ -18,6 +18,7 @@
#define _BACKTRACE_BACKTRACE_MAP_H
#include <stdint.h>
+#include <sys/types.h>
#ifdef USE_MINGW
// MINGW does not define these constants.
#define PROT_NONE 0
diff --git a/libbacktrace/UnwindMap.cpp b/libbacktrace/UnwindMap.cpp
index 1615518..4f9831b 100644
--- a/libbacktrace/UnwindMap.cpp
+++ b/libbacktrace/UnwindMap.cpp
@@ -15,6 +15,7 @@
*/
#include <pthread.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <unistd.h>