about summary refs log tree commit diff
path: root/absl/debugging
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-05-07T18·12-0700
committerJohn Olson <jolson@google.com>2018-05-07T18·24-0400
commitbd5a2bba8f4238db2e06c99ac808fc8327dec2a0 (patch)
treeb377f054aba0e7757bd15b3bb44b189cc3a21132 /absl/debugging
parent26b789f9a53d086c8b8c9c2668efb251e37861cd (diff)
- 45690246da1e36acde86c941b68aad2248b16ea7 Import of CCTZ from Github. by Abseil Team <absl-team@google.com>
  - ff3cf0774f9903fb62f7012af24c0901286a1b80 Fix -Wunreachable-code-return warning (from clang 6.0) in by Derek Mauro <dmauro@google.com>
  - b41ca35e56f6137cf6672d16613a7edfd6107e27 Include port.h to drag in platform-specific configurations. by Abseil Team <absl-team@google.com>
  - 5d50b728937d245caedaa2208a97d52f55040134 Set the default symbolizer for Mutex deadlock detector re... by Derek Mauro <dmauro@google.com>

GitOrigin-RevId: 45690246da1e36acde86c941b68aad2248b16ea7
Change-Id: I2c6a87e9090657ff3fb456f3409bfdc24b8b765a
Diffstat (limited to 'absl/debugging')
-rw-r--r--absl/debugging/failure_signal_handler.cc3
-rw-r--r--absl/debugging/internal/symbolize.h1
2 files changed, 3 insertions, 1 deletions
diff --git a/absl/debugging/failure_signal_handler.cc b/absl/debugging/failure_signal_handler.cc
index 3de45f0bb22c..3aaa29f70759 100644
--- a/absl/debugging/failure_signal_handler.cc
+++ b/absl/debugging/failure_signal_handler.cc
@@ -162,8 +162,9 @@ static int MaybeSetupAlternateStack() {
 #ifndef _WIN32
   ABSL_ATTRIBUTE_UNUSED static const bool kOnce = SetupAlternateStackOnce();
   return SA_ONSTACK;
-#endif
+#else
   return 0;
+#endif
 }
 
 #ifdef ABSL_HAVE_SIGACTION
diff --git a/absl/debugging/internal/symbolize.h b/absl/debugging/internal/symbolize.h
index 7ae13839b7c3..8d926fec48aa 100644
--- a/absl/debugging/internal/symbolize.h
+++ b/absl/debugging/internal/symbolize.h
@@ -20,6 +20,7 @@
 
 #include <cstddef>
 #include <cstdint>
+#include "absl/base/port.h"  // Needed for string vs std::string
 
 #ifdef ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE
 #error ABSL_INTERNAL_HAVE_ELF_SYMBOLIZE cannot be directly set