[Bf-blender-cvs] [bd8cbf5] master: Glog: Fix compilation error on ppc64el

[Sergey Sharybin]

Commit: bd8cbf5c079b4cffb3652195ba8a9c92d8a60d15
Author: Sergey Sharybin
Date:   Mon Nov 21 21:04:48 2016 +0100
Branches: master
https://developer.blender.org/rBbd8cbf5c079b4cffb3652195ba8a9c92d8a60d15

Glog: Fix compilation error on ppc64el

This was fixed in upstream already. Time to re-bundle?

===================================================================

M	extern/glog/src/stacktrace_powerpc-inl.h

===================================================================

diff --git a/extern/glog/src/stacktrace_powerpc-inl.h b/extern/glog/src/stacktrace_powerpc-inl.h
index 1090dde..03b9108 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)