diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-18 21:25:05 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-18 21:25:05 +0400 |
| commit | de8612ec6235044701aa8cb2e7d28cce95b95f86 (patch) | |
| tree | 99a06cc7a6028d32a8035a60eafac82c64ece7f2 /extern/libmv | |
| parent | 5909564e08d2bbdd8f94e2562c1abcf0c3f61b94 (diff) | |
| parent | 16ffa8e8f432ac2c0909117b48a98cb4b36eaff6 (diff) | |
Merging r43130 through r43500 from trunk into soc-2011-tomato
Diffstat (limited to 'extern/libmv')
| -rw-r--r-- | extern/libmv/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | extern/libmv/SConscript | 2 | ||||
| -rwxr-xr-x | extern/libmv/bundle.sh | 4 | ||||
| -rw-r--r-- | extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h | 4 | ||||
| -rw-r--r-- | extern/libmv/third_party/glog/src/utilities.cc | 2 |
5 files changed, 9 insertions, 5 deletions
diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt index 671520a76f8..1e370e5f31b 100644 --- a/extern/libmv/CMakeLists.txt +++ b/extern/libmv/CMakeLists.txt @@ -22,7 +22,7 @@ # # ***** END GPL LICENSE BLOCK ***** -# NOTEL This file is automatically generated by bundle.sh script +# NOTE: This file is automatically generated by bundle.sh script # If you're doing changes in this file, please update template # in that script too diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript index a2132e73f03..fbcd92503d8 100644 --- a/extern/libmv/SConscript +++ b/extern/libmv/SConscript @@ -1,6 +1,6 @@ #!/usr/bin/python -# NOTEL This file is automatically generated by bundle.sh script +# NOTE: This file is automatically generated by bundle.sh script # If you're doing changes in this file, please update template # in that script too diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh index ca808e12d7e..f5cfcc0d488 100755 --- a/extern/libmv/bundle.sh +++ b/extern/libmv/bundle.sh @@ -113,7 +113,7 @@ cat > CMakeLists.txt << EOF # # ***** END GPL LICENSE BLOCK ***** -# NOTEL This file is automatically generated by bundle.sh script +# NOTE: This file is automatically generated by bundle.sh script # If you're doing changes in this file, please update template # in that script too @@ -209,7 +209,7 @@ EOF cat > SConscript << EOF #!/usr/bin/python -# NOTEL This file is automatically generated by bundle.sh script +# NOTE: This file is automatically generated by bundle.sh script # If you're doing changes in this file, please update template # in that script too diff --git a/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h b/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h index f7d1dca85bc..e3729e1fd39 100644 --- a/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h +++ b/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h @@ -33,6 +33,10 @@ extern "C" { #include <stdlib.h> // for NULL +#if defined(__FreeBSD__) +/* devel/libunwind only includes _Unwind_Backtrace if this is set */ +#define _GNU_SOURCE 1 +#endif #include <unwind.h> // ABI defined unwinder } #include "stacktrace.h" diff --git a/extern/libmv/third_party/glog/src/utilities.cc b/extern/libmv/third_party/glog/src/utilities.cc index e97d4f237ec..6d64b923703 100644 --- a/extern/libmv/third_party/glog/src/utilities.cc +++ b/extern/libmv/third_party/glog/src/utilities.cc @@ -223,7 +223,7 @@ int32 GetMainThreadPid() { pid_t GetTID() { // On Linux and FreeBSD, we try to use gettid(). -#if defined OS_LINUX || defined OS_FREEBSD || defined OS_MACOSX +#if defined OS_LINUX || defined OS_MACOSX #ifndef __NR_gettid #ifdef OS_MACOSX #define __NR_gettid SYS_gettid |