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

* commit '3a49aa7b19945b369221ce486778d7cd70ad066f': Only include ucontext.h when necessary.
2014-05-10 00:23:24 +00:00 · 2014-05-10 00:23:24 +00:00 · 413001aa6c
parent f4e28c3956 3a49aa7b19
commit 413001aa6c
4 changed files with 3 additions and 2 deletions
--- 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>
--- 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:
--- 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>
--- 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>