Differential D18757 Diff 55230 www/qt5-webengine/files/patch-src_3rdparty_chromium_base_logging__unittest.cc
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_logging__unittest.cc
- This file was added.
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- src/3rdparty/chromium/base/logging_unittest.cc.orig 2018-11-13 18:25:11 UTC | |||||
+++ src/3rdparty/chromium/base/logging_unittest.cc | |||||
@@ -420,10 +420,10 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo | |||||
// need the arch-specific boilerplate below, which is inspired by breakpad. | |||||
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. | |||||
uintptr_t crash_addr = 0; | |||||
-#if defined(OS_MACOSX) | |||||
+#if defined(OS_MACOSX) || defined(OS_BSD) | |||||
crash_addr = reinterpret_cast<uintptr_t>(info->si_addr); | |||||
#else // OS_POSIX && !OS_MACOSX | |||||
- ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr); | |||||
+ struct ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr); | |||||
#if defined(ARCH_CPU_X86) | |||||
crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]); | |||||
#elif defined(ARCH_CPU_X86_64) |