[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43332] trunk/blender/extern/libmv/ third_party/glog/src: Fixing FreeBSD x64 build
Sergey Sharybin
sergey.vfx at gmail.com
Thu Jan 12 20:38:13 CET 2012
Revision: 43332
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43332
Author: nazgul
Date: 2012-01-12 19:38:08 +0000 (Thu, 12 Jan 2012)
Log Message:
-----------
Fixing FreeBSD x64 build
Patch by Shane Ambler, thanks!
Modified Paths:
--------------
trunk/blender/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
trunk/blender/extern/libmv/third_party/glog/src/utilities.cc
Modified: trunk/blender/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
===================================================================
--- trunk/blender/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h 2012-01-12 19:17:47 UTC (rev 43331)
+++ trunk/blender/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h 2012-01-12 19:38:08 UTC (rev 43332)
@@ -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"
Modified: trunk/blender/extern/libmv/third_party/glog/src/utilities.cc
===================================================================
--- trunk/blender/extern/libmv/third_party/glog/src/utilities.cc 2012-01-12 19:17:47 UTC (rev 43331)
+++ trunk/blender/extern/libmv/third_party/glog/src/utilities.cc 2012-01-12 19:38:08 UTC (rev 43332)
@@ -223,7 +223,7 @@
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
More information about the Bf-blender-cvs
mailing list