Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/extern
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-01-12 23:38:08 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-01-12 23:38:08 +0400
commit101e8d862401d15c95ca2ab9c017f805f9c6875f (patch)
treeb4f2726330360732dd0a075b4d74b963aab00894 /extern
parent7889905888e70996b8fce714d71114561d3f40be (diff)
Fixing FreeBSD x64 build
Patch by Shane Ambler, thanks!
Diffstat (limited to 'extern')
-rw-r--r--extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h4
-rw-r--r--extern/libmv/third_party/glog/src/utilities.cc2
2 files changed, 5 insertions, 1 deletions
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