commit d8698d739f68a201d272d2b8cc3c3ab0ad3f621b
author Christopher Ferris <cferris@google.com> Sat May 10 00:27:42 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat May 10 00:27:42 2014 +0000
tree 880e5f7a6db566c0ab77f038a62e9748c5263a23
parent 1d0fedefbf0ce2f8b61292acf012d0e262fbe704
parent 413001aa6cd4addcf544348020f992ebc6d3e2d4

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

* commit '413001aa6cd4addcf544348020f992ebc6d3e2d4':
  Only include ucontext.h when necessary.

libbacktrace/BacktraceImpl.cpp

diff --git a/libbacktrace/BacktraceImpl.cpp b/libbacktrace/BacktraceImpl.cpp
index d7ac0b2..405b042 100644
--- a/libbacktrace/BacktraceImpl.cpp
+++ b/libbacktrace/BacktraceImpl.cpp
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <sys/ptrace.h>
 #include <sys/types.h>
+#include <ucontext.h>
 #include <unistd.h>
 
 #include <string>

libbacktrace/BacktraceImpl.h

diff --git a/libbacktrace/BacktraceImpl.h b/libbacktrace/BacktraceImpl.h
index 8ed64b3..d34ad05 100755
--- a/libbacktrace/BacktraceImpl.h
+++ b/libbacktrace/BacktraceImpl.h
@@ -21,7 +21,6 @@
 #include <backtrace/BacktraceMap.h>
 
 #include <sys/types.h>
-#include <ucontext.h>
 
 class BacktraceImpl {
 public:

libbacktrace/UnwindCurrent.cpp

diff --git a/libbacktrace/UnwindCurrent.cpp b/libbacktrace/UnwindCurrent.cpp
index e5f7c3d..b176aaf 100755
--- a/libbacktrace/UnwindCurrent.cpp
+++ b/libbacktrace/UnwindCurrent.cpp
@@ -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>

libbacktrace/UnwindPtrace.cpp

diff --git a/libbacktrace/UnwindPtrace.cpp b/libbacktrace/UnwindPtrace.cpp
index 63b4f16..7ba8775 100644
--- a/libbacktrace/UnwindPtrace.cpp
+++ b/libbacktrace/UnwindPtrace.cpp
@@ -19,6 +19,7 @@
 
 #include <sys/types.h>
 #include <string.h>
+#include <ucontext.h>
 
 #include <libunwind.h>
 #include <libunwind-ptrace.h>