about summary refs log tree commit diff
path: root/absl
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-02-16T19·47-0800
committerDerek Mauro <dmauro@google.com>2018-02-20T14·55-0500
commit03c1513538584f4a04d666be5eb469e3979febba (patch)
tree8be44676c20364e6ff69da895cdf70ec23b1d9c4 /absl
parente2d17845973714cda3e828c16131f245dd82b2b6 (diff)
Changes imported from Abseil "staging" branch:
  - adae1fe5510c93311cd38aad35c463537048f425 Add !defined(_WIN32) to the conditions for by Derek Mauro <dmauro@google.com>

GitOrigin-RevId: adae1fe5510c93311cd38aad35c463537048f425
Change-Id: Iaa8bb315048404777b5d3f57e0efdb2501945021
Diffstat (limited to 'absl')
-rw-r--r--absl/debugging/internal/stack_consumption.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/absl/debugging/internal/stack_consumption.h b/absl/debugging/internal/stack_consumption.h
index 5aa1a109b657..4c5fa0f0d821 100644
--- a/absl/debugging/internal/stack_consumption.h
+++ b/absl/debugging/internal/stack_consumption.h
@@ -22,7 +22,7 @@
 // Use this feature test macro to detect its availability.
 #ifdef ABSL_INTERNAL_HAVE_DEBUGGING_STACK_CONSUMPTION
 #error ABSL_INTERNAL_HAVE_DEBUGGING_STACK_CONSUMPTION cannot be set directly
-#elif !defined(__APPLE__) && \
+#elif !defined(__APPLE__) && !defined(_WIN32) && \
     (defined(__i386__) || defined(__x86_64__) || defined(__ppc__))
 #define ABSL_INTERNAL_HAVE_DEBUGGING_STACK_CONSUMPTION 1