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
This commit is contained in:
Abseil Team 2017-10-02 09:45:23 -07:00 committed by vslashg
parent 8d8dcb0ae5
commit 9c4178d13e
3 changed files with 14 additions and 15 deletions

View file

@ -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