commit f4e28c3956627accf2bdea96f9dd32fcd543de9c
author Christopher Ferris <cferris@google.com> Fri May 09 21:01:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 09 21:01:59 2014 +0000
tree bafdb620ca512a2f9c9abd38423752c0d62e5d4e
parent 8ad708c56570d81def649911bdfc42f5c350e4b8
parent 0f5e957963d6f455f4685772d0e1181d8f44e7bd

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

* commit '0f5e957963d6f455f4685772d0e1181d8f44e7bd':
  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: