diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-12 12:45:06 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-03-12 12:45:06 +0400 |
| commit | b22e06bf7b7aa643ae68fa08f05848475bb3dd8f (patch) | |
| tree | bea7f5244a432acd8098a1668d5788518cb24ea3 /extern/libmv/third_party/glog | |
| parent | ea56a54747dde1aaa8aa2e89d04486870c05e815 (diff) | |
Re-bundle libmv from own branch.
Should resolve compilation error on some platforms when using linux and
compilation error of libmv on FreeBSB.
It was a regression caused by not applied changes on config_linux.h
and some changes made to utilities.cc were also occasionally missed.
Diffstat (limited to 'extern/libmv/third_party/glog')
| -rw-r--r-- | extern/libmv/third_party/glog/src/config_linux.h | 11 | ||||
| -rw-r--r-- | extern/libmv/third_party/glog/src/utilities.cc | 6 |
2 files changed, 12 insertions, 5 deletions
diff --git a/extern/libmv/third_party/glog/src/config_linux.h b/extern/libmv/third_party/glog/src/config_linux.h index 19beaa5cf40..5877029882a 100644 --- a/extern/libmv/third_party/glog/src/config_linux.h +++ b/extern/libmv/third_party/glog/src/config_linux.h @@ -110,7 +110,7 @@ #define HAVE___BUILTIN_EXPECT 1 /* define if your compiler has __sync_val_compare_and_swap */ -#define HAVE___SYNC_VAL_COMPARE_AND_SWAP 1 +/* #undef HAVE___SYNC_VAL_COMPARE_AND_SWAP */ /* Define to the sub-directory in which libtool stores uninstalled libraries. */ @@ -138,7 +138,13 @@ #define PACKAGE_VERSION "0.3.2" /* How to access the PC from a struct ucontext */ -#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP] +#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) + #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP] +#elif defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) + #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP] +#else + #undef PC_FROM_UCONTEXT +#endif /* Define to necessary symbol if this constant uses a non-standard name on your system. */ @@ -150,6 +156,7 @@ /* Define to 1 if you have the ANSI C header files. */ /* #undef STDC_HEADERS */ +#define STDC_HEADERS 1 /* the namespace where STL code like vector<> is defined */ #define STL_NAMESPACE std diff --git a/extern/libmv/third_party/glog/src/utilities.cc b/extern/libmv/third_party/glog/src/utilities.cc index 27b2a905055..c9db2b7f7cd 100644 --- a/extern/libmv/third_party/glog/src/utilities.cc +++ b/extern/libmv/third_party/glog/src/utilities.cc @@ -233,8 +233,8 @@ bool PidHasChanged() { } pid_t GetTID() { - // On Linux and FreeBSD, we try to use gettid(). -#if defined OS_LINUX || defined OS_FREEBSD || defined OS_MACOSX + // On Linux and MACOSX , we try to use gettid(). +#if defined OS_LINUX || defined OS_MACOSX #ifndef __NR_gettid #ifdef OS_MACOSX #define __NR_gettid SYS_gettid @@ -256,7 +256,7 @@ pid_t GetTID() { // the value change to "true". lacks_gettid = true; } -#endif // OS_LINUX || OS_FREEBSD +#endif // OS_LINUX || OS_MACOSX // If gettid() could not be used, we use one of the following. #if defined OS_LINUX |