diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-28 09:50:02 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-28 09:50:02 +0400 |
| commit | 729ddf51b7b8e5b8d5a91aa63940196dbfca9604 (patch) | |
| tree | b4e880d3ea2222cb75b68b93c15c607c829a2eac /extern | |
| parent | dd40560230102fb5a6ba185b491e86c56d84bfae (diff) | |
revert r44503, (left patch file in for now), this gives an error with gcc:
extern/libmv/third_party/glog/src/utilities.cc:318: error: undefined reference to 'google::InstallFailureFunction(void (*)())'
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/third_party/glog/src/logging.cc | 17 | ||||
| -rw-r--r-- | extern/libmv/third_party/glog/src/utilities.h | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/extern/libmv/third_party/glog/src/logging.cc b/extern/libmv/third_party/glog/src/logging.cc index f7488b3e04c..1bb3867aa10 100644 --- a/extern/libmv/third_party/glog/src/logging.cc +++ b/extern/libmv/third_party/glog/src/logging.cc @@ -1231,14 +1231,6 @@ void LogMessage::RecordCrashReason( #endif } -#if defined(HAVE___ATTRIBUTE__) -typedef void (*fail_func_t)() __attribute__((noreturn)); -static void logging_fail() __attribute__((noreturn)); -#else -typedef void (*fail_func_t)(); -static void logging_fail(); -#endif - static void logging_fail() { // #if defined(_DEBUG) && defined(_MSC_VER) // doesn't work for my laptop (sergey) @@ -1251,9 +1243,14 @@ static void logging_fail() { #endif } -GOOGLE_GLOG_DLL_DECL fail_func_t g_logging_fail_func = &logging_fail; +#ifdef HAVE___ATTRIBUTE__ +GOOGLE_GLOG_DLL_DECL +void (*g_logging_fail_func)() __attribute__((noreturn)) = &logging_fail; +#else +GOOGLE_GLOG_DLL_DECL void (*g_logging_fail_func)() = &logging_fail; +#endif -void InstallFailureFunction(fail_func_t fail_func) { +void InstallFailureFunction(void (*fail_func)()) { g_logging_fail_func = fail_func; } diff --git a/extern/libmv/third_party/glog/src/utilities.h b/extern/libmv/third_party/glog/src/utilities.h index 6d7262e84ae..bbb0eb0746c 100644 --- a/extern/libmv/third_party/glog/src/utilities.h +++ b/extern/libmv/third_party/glog/src/utilities.h @@ -105,7 +105,7 @@ # undef STACKTRACE_H #elif defined(HAVE_LIB_UNWIND) # define STACKTRACE_H "stacktrace_libunwind-inl.h" -#elif !defined(NO_FRAME_POINTER) && !defined(__clang__) +#elif !defined(NO_FRAME_POINTER) # if defined(__i386__) && __GNUC__ >= 2 # define STACKTRACE_H "stacktrace_x86-inl.h" # elif defined(__x86_64__) && __GNUC__ >= 2 |