From bd8cbf5c079b4cffb3652195ba8a9c92d8a60d15 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 21 Nov 2016 21:04:48 +0100 Subject: Glog: Fix compilation error on ppc64el This was fixed in upstream already. Time to re-bundle? --- extern/glog/src/stacktrace_powerpc-inl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extern/glog/src') 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) -- cgit v1.2.3