From 720c017e30339fd1786ce4aac68bc8559736e53f Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 13 Dec 2017 12:02:15 -0800 Subject: Changes imported from Abseil "staging" branch: - a42e9b454ca8be7d021789cdb9bcada07d3e2d3e Merge pull request #57. by Derek Mauro - b1e03838f059c034a6489501804d516326246042 Move the long ostream tests into a separate source file u... by Alex Strelnikov - 7c56b7dbb05faa7e8653632e00be470331d79cb9 Return reference from absl::InlinedVector::emplace_back(). by Abseil Team - 85b070822b62688ff348d9ad9cc9e230a851f617 Treat \u or \U followed by Unicode surrogate character as... by Abseil Team GitOrigin-RevId: a42e9b454ca8be7d021789cdb9bcada07d3e2d3e Change-Id: I7d8fb68ffd7eb4e9e737f21fbed6d56b71985f94 --- absl/debugging/internal/stacktrace_config.h | 2 +- absl/debugging/internal/stacktrace_powerpc-inl.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'absl/debugging/internal') diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h index 9bd2a2a..ed82722 100644 --- a/absl/debugging/internal/stacktrace_config.h +++ b/absl/debugging/internal/stacktrace_config.h @@ -26,7 +26,7 @@ #error ABSL_STACKTRACE_INL_HEADER cannot be directly set #elif defined(__native_client__) || defined(__APPLE__) || \ defined(__FreeBSD__) || defined(__ANDROID__) || defined(__myriad2__) || \ - defined(asmjs__) || defined(__Fuchsia__) + defined(__asmjs__) || defined(__Fuchsia__) #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_unimplemented-inl.inc" diff --git a/absl/debugging/internal/stacktrace_powerpc-inl.inc b/absl/debugging/internal/stacktrace_powerpc-inl.inc index 60a889a..9193e2d 100644 --- a/absl/debugging/internal/stacktrace_powerpc-inl.inc +++ b/absl/debugging/internal/stacktrace_powerpc-inl.inc @@ -48,7 +48,7 @@ static inline void *StacktracePowerPCGetLR(void **sp) { #elif defined(_CALL_SYSV) return *(sp+1); #elif defined(__APPLE__) || defined(__FreeBSD__) || \ - (defined(__linux__) && defined(__PPC64__)) + (defined(__linux__) && defined(__PPC64__)) // This check is in case the compiler doesn't define _CALL_AIX/etc. return *(sp+2); #elif defined(__linux) -- cgit v1.2.3