summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-05-22 13:32:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-22 13:32:56 +0000
commite2a3d37c8f7883255a7d9da0f3af79eccb1f013b (patch)
treee3fb527f92c76626001a9eac7ff47c186ed72a10
parent3db03a5ab0cb7713529c298531be6da7c2193525 (diff)
parent219e867f61755720af3cddb5e8d2fe0e198a27ab (diff)
downloadsystem_core-e2a3d37c8f7883255a7d9da0f3af79eccb1f013b.zip
system_core-e2a3d37c8f7883255a7d9da0f3af79eccb1f013b.tar.gz
system_core-e2a3d37c8f7883255a7d9da0f3af79eccb1f013b.tar.bz2
am 219e867f: am 7f8ebb81: am 30291f21: Merge "Add missing headers"
* commit '219e867f61755720af3cddb5e8d2fe0e198a27ab': 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>