diff options
| author | Christopher Ferris <cferris@google.com> | 2014-05-09 21:01:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 21:01:59 +0000 |
| commit | f4e28c3956627accf2bdea96f9dd32fcd543de9c (patch) | |
| tree | bafdb620ca512a2f9c9abd38423752c0d62e5d4e /include | |
| parent | 8ad708c56570d81def649911bdfc42f5c350e4b8 (diff) | |
| parent | 0f5e957963d6f455f4685772d0e1181d8f44e7bd (diff) | |
| download | system_core-f4e28c3956627accf2bdea96f9dd32fcd543de9c.zip system_core-f4e28c3956627accf2bdea96f9dd32fcd543de9c.tar.gz system_core-f4e28c3956627accf2bdea96f9dd32fcd543de9c.tar.bz2 | |
am 0f5e9579: am b49f23ed: Merge "Fix ucontext_t forward declare for mac."
* commit '0f5e957963d6f455f4685772d0e1181d8f44e7bd':
Fix ucontext_t forward declare for mac.
Diffstat (limited to 'include')
| -rw-r--r-- | include/backtrace/Backtrace.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ struct backtrace_frame_data_t { // 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: |