commit 0f5e957963d6f455f4685772d0e1181d8f44e7bd
author Christopher Ferris <cferris@google.com> Fri May 09 20:58:04 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 09 20:58:04 2014 +0000
tree 75806eaa3851a0a489de4c0c4bb1baea458a4f6c
parent c1087e55c63f2c206eae676fd4c237585a64e8e5
parent b49f23ed3198ee6129ad675e26c8d197ed984017

am b49f23ed: Merge "Fix ucontext_t forward declare for mac."

* commit 'b49f23ed3198ee6129ad675e26c8d197ed984017':
  Fix ucontext_t forward declare for mac.

include/backtrace/Backtrace.h

diff --git a/include/backtrace/Backtrace.h b/include/backtrace/Backtrace.h
index 84b5631..e07d322 100644
--- a/include/backtrace/Backtrace.h
+++ b/include/backtrace/Backtrace.h
@@ -47,8 +47,13 @@
 // Forward declarations.
 class BacktraceImpl;
 
+#if defined(__APPLE__)
+struct __darwin_ucontext;
+typedef __darwin_ucontext ucontext_t;
+#else
 struct ucontext;
 typedef ucontext ucontext_t;
+#endif
 
 class Backtrace {
 public: