diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-30 14:51:21 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-30 15:01:28 +0300 |
commit | 6b7ead4fe808d6442fe7ae9b7f4ec38de8f35ee0 (patch) | |
tree | ebf2e87f4450d5e689a84fc9bc7ed6263e295748 /extern/libmv/third_party/glog/src/utilities.cc | |
parent | 2583cc88dea50d143a27aeafaa0870cc668662c4 (diff) |
Libmv: Update to the latest upstream version
Main reason is to bring up new Glog which should have MSVC 2015
support.
Diffstat (limited to 'extern/libmv/third_party/glog/src/utilities.cc')
-rw-r--r-- | extern/libmv/third_party/glog/src/utilities.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/extern/libmv/third_party/glog/src/utilities.cc b/extern/libmv/third_party/glog/src/utilities.cc index 1e8836d243f..5c88e58d3c0 100644 --- a/extern/libmv/third_party/glog/src/utilities.cc +++ b/extern/libmv/third_party/glog/src/utilities.cc @@ -84,7 +84,7 @@ static void DebugWriteToStderr(const char* data, void *) { } } -static void DebugWriteToString(const char* data, void *arg) { +void DebugWriteToString(const char* data, void *arg) { reinterpret_cast<string*>(arg)->append(data); } @@ -138,13 +138,15 @@ static void DumpStackTraceAndExit() { // TOOD(hamaji): Use signal instead of sigaction? #ifdef HAVE_SIGACTION - // Set the default signal handler for SIGABRT, to avoid invoking our - // own signal handler installed by InstallFailedSignalHandler(). - struct sigaction sig_action; - memset(&sig_action, 0, sizeof(sig_action)); - sigemptyset(&sig_action.sa_mask); - sig_action.sa_handler = SIG_DFL; - sigaction(SIGABRT, &sig_action, NULL); + if (IsFailureSignalHandlerInstalled()) { + // Set the default signal handler for SIGABRT, to avoid invoking our + // own signal handler installed by InstallFailureSignalHandler(). + struct sigaction sig_action; + memset(&sig_action, 0, sizeof(sig_action)); + sigemptyset(&sig_action.sa_mask); + sig_action.sa_handler = SIG_DFL; + sigaction(SIGABRT, &sig_action, NULL); + } #endif // HAVE_SIGACTION abort(); |