[Libreoffice-commits] core.git: external/breakpad

[Libreoffice Gerrit user]

 external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8cde5d96a2172acfa748235186e700029de62ee1
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Aug 16 13:59:43 2018 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Aug 16 13:59:43 2018 +0200

    Adapt external/breakpad/0001-Handle-race-between-ExceptionHandler...
    
    to old compilers that default to < C++11.  (Explicitly passing CXXFLAGS_CXX11
    into ExternalProject_breakpad wouldn't work well for now, as it would cause
    -Wregister error with -std=c++17 at
    workdir/UnpackedTarball/breakpad/src/common/dwarf/dwarf2reader.cc:878:43.)
    
    Change-Id: I1d04e0f05e36e2f9622991fb477f430a062fee0b

diff --git a/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1 b/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
index a88c2cdd32bb..00762650f5f5 100644
--- a/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
+++ b/external/breakpad/0001-Handle-race-between-ExceptionHandler-SignalHandler-a.patch.1
@@ -21,7 +21,7 @@ index b895f6d7..4d58e510 100644
    bool handled = false;
 -  for (int i = g_handler_stack_->size() - 1; !handled && i >= 0; --i) {
 -    handled = (*g_handler_stack_)[i]->HandleSignal(sig, info, uc);
-+  if (g_handler_stack_ != nullptr) {
++  if (g_handler_stack_ != NULL) {
 +    for (int i = g_handler_stack_->size() - 1; !handled && i >= 0; --i) {
 +      handled = (*g_handler_stack_)[i]->HandleSignal(sig, info, uc);
 +    }