about summary refs log tree commit diff
path: root/absl/base/config.h
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2017-10-02T16·45-0700
committervslashg <gfalcon@google.com>2017-10-02T18·43-0400
commit9c4178d13e84acf3f0d1b8aeee1f67862aeeadc9 (patch)
tree1aa4f76ba354cfc298e80bc4a55c26e8795c56ed /absl/base/config.h
parent8d8dcb0ae550fbfdbd7392a3c9d2c5c596bdcde3 (diff)
Changes imported from Abseil "staging" branch:
  - 1a906f90b303c6fbac292f4883186a27e7c6476c Increase the mutex_test timeout (by removing the timeout ... by Derek Mauro <dmauro@google.com>
  - cfc1d3e56727e5b3a41b7d9dfc513f692ac0edd6 Require iOS 9.0 for ABSL_HAVE_THREAD_LOCAL. by Matt Armstrong <marmstrong@google.com>
  - 22dc24504ac6fbd2a22f5d45a4bd00fe14d500c3 Fix indentation by Jorg Brown <jorg@google.com>

GitOrigin-RevId: 1a906f90b303c6fbac292f4883186a27e7c6476c
Change-Id: Id6075001460bd6b9ce973897544269fa4103fee8
Diffstat (limited to 'absl/base/config.h')
-rw-r--r--absl/base/config.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/absl/base/config.h b/absl/base/config.h
index c768e7223b93..875d8e4fbada 100644
--- a/absl/base/config.h
+++ b/absl/base/config.h
@@ -162,9 +162,9 @@
 #error ABSL_HAVE_THREAD_LOCAL cannot be directly set
 #elif !defined(__apple_build_version__) ||   \
     ((__apple_build_version__ >= 8000042) && \
-     !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0))
+     !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_9_0))
 // Notes: Xcode's clang did not support `thread_local` until version
-// 8, and even then not for iOS < 8.0.
+// 8, and even then not for all iOS < 9.0.
 #define ABSL_HAVE_THREAD_LOCAL 1
 #endif