diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:03:11 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-03-20 21:26:25 +0400 |
commit | 6ba5c0c2683bb7718dfceca3868d5f2c9e4795c1 (patch) | |
tree | 11989e797939c41ba4b889ebcfe63456320a50cf /extern/libmv/third_party/glog/src/utilities.h | |
parent | 2ea78fb28f5f90c736b6d048b5e1f1d787c48920 (diff) |
Update Libmv to latest upstream
This is mainly a maintaince commit which syncs changes
between Blender and Libmv upstream also bringing new
GLog version.
This GLog version is presumably have better support of
MinGW from "the box".
This commit is also aimed to make further 3d part libs
update easier.
Diffstat (limited to 'extern/libmv/third_party/glog/src/utilities.h')
-rw-r--r-- | extern/libmv/third_party/glog/src/utilities.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extern/libmv/third_party/glog/src/utilities.h b/extern/libmv/third_party/glog/src/utilities.h index c8215b73f33..4f41c92e434 100644 --- a/extern/libmv/third_party/glog/src/utilities.h +++ b/extern/libmv/third_party/glog/src/utilities.h @@ -79,7 +79,7 @@ #endif #include "config.h" -#include <glog/logging.h> +#include "glog/logging.h" // There are three different ways we can try to get the stack trace: // @@ -108,7 +108,7 @@ #elif !defined(NO_FRAME_POINTER) # if defined(__i386__) && __GNUC__ >= 2 # define STACKTRACE_H "stacktrace_x86-inl.h" -# elif defined(__x86_64__) && __GNUC__ >= 2 +# elif defined(__x86_64__) && __GNUC__ >= 2 && HAVE_UNWIND_H # define STACKTRACE_H "stacktrace_x86_64-inl.h" # elif (defined(__ppc__) || defined(__PPC__)) && __GNUC__ >= 2 # define STACKTRACE_H "stacktrace_powerpc-inl.h" |