commit e2a3d37c8f7883255a7d9da0f3af79eccb1f013b
author Dan Albert <danalbert@google.com> Thu May 22 13:32:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 22 13:32:56 2014 +0000
tree e3fb527f92c76626001a9eac7ff47c186ed72a10
parent 3db03a5ab0cb7713529c298531be6da7c2193525
parent 219e867f61755720af3cddb5e8d2fe0e198a27ab

am 219e867f: am 7f8ebb81: am 30291f21: Merge "Add missing headers"

* commit '219e867f61755720af3cddb5e8d2fe0e198a27ab':
  Add missing headers

include/backtrace/BacktraceMap.h

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

libbacktrace/UnwindMap.cpp

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>