From 0aa9ab69ccafdeff231927ff66ca8e87d4de8143 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 17 Feb 2012 20:53:34 +0000 Subject: glog should now compile fine at FreeBSD 9 platform --- extern/libmv/third_party/glog/src/config_freebsd.h | 2 +- extern/libmv/third_party/glog/src/utilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'extern') diff --git a/extern/libmv/third_party/glog/src/config_freebsd.h b/extern/libmv/third_party/glog/src/config_freebsd.h index caaef9d998b..28fa1f1c78b 100644 --- a/extern/libmv/third_party/glog/src/config_freebsd.h +++ b/extern/libmv/third_party/glog/src/config_freebsd.h @@ -11,7 +11,7 @@ #define HAVE_DLFCN_H 1 /* Define to 1 if you have the header file. */ -#define HAVE_EXECINFO_H 1 +#undef HAVE_EXECINFO_H /* Define if you have the `fcntl' function */ #define HAVE_FCNTL 1 diff --git a/extern/libmv/third_party/glog/src/utilities.h b/extern/libmv/third_party/glog/src/utilities.h index 5c841a0b90b..bbb0eb0746c 100644 --- a/extern/libmv/third_party/glog/src/utilities.h +++ b/extern/libmv/third_party/glog/src/utilities.h @@ -101,7 +101,7 @@ // correctly when GetStackTrace() is called with max_depth == 0. // Some code may do that. -#if __MINGW32__ +#if defined(__MINGW32__) || defined(__FreeBSD__) # undef STACKTRACE_H #elif defined(HAVE_LIB_UNWIND) # define STACKTRACE_H "stacktrace_libunwind-inl.h" -- cgit v1.2.3