diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:03:11 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:26:25 +0400 |
commit | 6ba5c0c2683bb7718dfceca3868d5f2c9e4795c1 (patch) | |
tree | 11989e797939c41ba4b889ebcfe63456320a50cf /extern/libmv/third_party/glog/src/utilities.cc | |
parent | 2ea78fb28f5f90c736b6d048b5e1f1d787c48920 (diff) |
Update Libmv to latest upstream
This is mainly a maintaince commit which syncs changes
between Blender and Libmv upstream also bringing new
GLog version.
This GLog version is presumably have better support of
MinGW from "the box".
This commit is also aimed to make further 3d part libs
update easier.
Diffstat (limited to 'extern/libmv/third_party/glog/src/utilities.cc')
-rw-r--r-- | extern/libmv/third_party/glog/src/utilities.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/extern/libmv/third_party/glog/src/utilities.cc b/extern/libmv/third_party/glog/src/utilities.cc index 159b094c170..1e8836d243f 100644 --- a/extern/libmv/third_party/glog/src/utilities.cc +++ b/extern/libmv/third_party/glog/src/utilities.cc @@ -136,6 +136,8 @@ static void DumpStackTrace(int skip_count, DebugWriter *writerfn, void *arg) { static void DumpStackTraceAndExit() { DumpStackTrace(1, DebugWriteToStderr, NULL); + // 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; @@ -143,6 +145,7 @@ static void DumpStackTraceAndExit() { sigemptyset(&sig_action.sa_mask); sig_action.sa_handler = SIG_DFL; sigaction(SIGABRT, &sig_action, NULL); +#endif // HAVE_SIGACTION abort(); } @@ -233,7 +236,7 @@ bool PidHasChanged() { } pid_t GetTID() { - // On Linux and MACOSX , we try to use gettid(). + // On Linux and MacOSX, we try to use gettid(). #if defined OS_LINUX || defined OS_MACOSX #ifndef __NR_gettid #ifdef OS_MACOSX @@ -331,6 +334,7 @@ void InitGoogleLoggingUtilities(const char* argv0) { void ShutdownGoogleLoggingUtilities() { CHECK(IsGoogleLoggingInitialized()) << "You called ShutdownGoogleLogging() without calling InitGoogleLogging() first!"; + g_program_invocation_short_name = NULL; #ifdef HAVE_SYSLOG_H closelog(); #endif |