diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-26 14:36:36 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-01-26 14:36:36 +0400 |
| commit | dbe432f73fd1628900d699431801209614e2e174 (patch) | |
| tree | b01ebfbd63100df011715e6c49f62dfc60bda4c4 /extern | |
| parent | 969c87b5afc19094fc77537f74f2b0b86d5448d3 (diff) | |
Fix build on debian ports that differs from generic i386/x86_64 like kFreeBSD
Patch by Kevin Roy, thanks!
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/libmv/third_party/glog/src/config.h | 10 | ||||
| -rw-r--r-- | extern/libmv/third_party/glog/src/config_linux.h | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/extern/libmv/third_party/glog/src/config.h b/extern/libmv/third_party/glog/src/config.h index 49c0d8905b0..102bf9e4034 100644 --- a/extern/libmv/third_party/glog/src/config.h +++ b/extern/libmv/third_party/glog/src/config.h @@ -2,14 +2,14 @@ /* src/config.h.in. Generated from configure.ac by autoheader. */ /* Namespace for Google classes */ -#ifdef __APPLE__ +#if defined(__APPLE__) #include "config_mac.h" -#elif __FreeBSD__ +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #include "config_freebsd.h" -#elif __MINGW32__ +#elif defined(__MINGW32__) #include "windows/config.h" -#elif __GNUC__ +#elif defined(__linux__) #include "config_linux.h" -#elif _MSC_VER +#elif defined(_MSC_VER) #include "windows/config.h" #endif diff --git a/extern/libmv/third_party/glog/src/config_linux.h b/extern/libmv/third_party/glog/src/config_linux.h index ffd4e778de6..faf032949bb 100644 --- a/extern/libmv/third_party/glog/src/config_linux.h +++ b/extern/libmv/third_party/glog/src/config_linux.h @@ -133,8 +133,10 @@ /* How to access the PC from a struct ucontext */ #if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) #define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP] -#else +#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 |