diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-10-30T14·56-0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-30T14·56-0400 |
| commit | 200b5a7cb0fb256ab47c933b3150aed91d9d3470 (patch) | |
| tree | 300713d880c593eb36cc6cea4bc8d1073bb03112 /absl/debugging/internal/stacktrace_x86-inl.inc | |
| parent | d5134a7f11e32d11caa67e75ae2ae2e506fb54ba (diff) | |
| parent | 0fece732a21c5ae8fef5fa8b3f0b8487bca68d83 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'absl/debugging/internal/stacktrace_x86-inl.inc')
| -rw-r--r-- | absl/debugging/internal/stacktrace_x86-inl.inc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/absl/debugging/internal/stacktrace_x86-inl.inc b/absl/debugging/internal/stacktrace_x86-inl.inc index 6e1af017878e..9bdaa542ce27 100644 --- a/absl/debugging/internal/stacktrace_x86-inl.inc +++ b/absl/debugging/internal/stacktrace_x86-inl.inc @@ -114,7 +114,9 @@ static const int kMaxFrameBytes = 100000; // vuc is a ucontext_t *. We use void* to avoid the use // of ucontext_t on non-POSIX systems. static uintptr_t GetFP(const void *vuc) { -#if defined(__linux__) +#if !defined(__linux__) + static_cast<void>(vuc); // Avoid an unused argument compiler warning. +#else if (vuc != nullptr) { auto *uc = reinterpret_cast<const ucontext_t *>(vuc); #if defined(__i386__) |