diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-11-21 23:04:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-11-21 23:04:48 +0300 |
| commit | bd8cbf5c079b4cffb3652195ba8a9c92d8a60d15 (patch) | |
| tree | 589f2a5e8435c6927f727744b7b9eeff1421edb2 /extern | |
| parent | dd51ec592f51c3f5787fe7527a81aae93a0b4b7c (diff) | |
Glog: Fix compilation error on ppc64el
This was fixed in upstream already. Time to re-bundle?
Diffstat (limited to 'extern')
| -rw-r--r-- | extern/glog/src/stacktrace_powerpc-inl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/glog/src/stacktrace_powerpc-inl.h b/extern/glog/src/stacktrace_powerpc-inl.h index 1090ddedbc7..03b91089aad 100644 --- a/extern/glog/src/stacktrace_powerpc-inl.h +++ b/extern/glog/src/stacktrace_powerpc-inl.h @@ -111,7 +111,7 @@ int GetStackTrace(void** result, int max_depth, int skip_count) { result[n++] = *(sp+2); #elif defined(_CALL_SYSV) result[n++] = *(sp+1); -#elif defined(__APPLE__) || (defined(__linux) && defined(__PPC64__)) +#elif defined(__APPLE__) || ((defined(__linux) || defined(__linux__)) && defined(__PPC64__)) // This check is in case the compiler doesn't define _CALL_AIX/etc. result[n++] = *(sp+2); #elif defined(__linux) |