diff options
| author |  Abseil Team <absl-team@google.com> | 2017-09-29 08:44:28 -0700 |
|---|---|---|
| committer |  Derek Mauro <dmauro@google.com> | 2017-09-29 11:50:21 -0400 |
| commit | 8d8dcb0ae550fbfdbd7392a3c9d2c5c596bdcde3 (patch) | |
| tree | a6ac55aa5c82e4170d059d0bbdeb10752c76742f /absl/base/config.h | |
| parent | cdf20caa491f59c0a35a8d8fbec0d948e4bc7e4c (diff) | |
Changes imported from Abseil "staging" branch:
- b76f5d50e1cb55050ef6004d6097dfdf0a806ff5 Fix ABSL_HAVE_THREAD_LOCAL for iOS < 8.0. by Matt Armstrong <marmstrong@google.com>
- 1dc71788a3f4ef601e03cbea59e36901479cde35 Add missing #include <intrin.h> to use __nop() on MSVC. by Derek Mauro <dmauro@google.com>
- f63ca6c7e87a7961912995b518b93af41b04bfa1 Fix typo (implict -> implicit) by Abseil Team <absl-team@google.com>
- 8096006dc52368f166ccd22e25fcee334e142508 Fix a typo. by Abseil Team <absl-team@google.com>
- c673a4a59790329fab33536caed6733dc03ec2a1 Add missing ":" in TODO. by Abseil Team <absl-team@google.com>
- 8125d214356501af0f3a8b3bb577eed083f0493f Fix comment nit. by Abseil Team <absl-team@google.com>
GitOrigin-RevId: b76f5d50e1cb55050ef6004d6097dfdf0a806ff5
Change-Id: I0168eb0c92b20ece2fe5ee54573c7720d00fd0b3
Diffstat (limited to 'absl/base/config.h')
| -rw-r--r-- | absl/base/config.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/absl/base/config.h b/absl/base/config.h index cf47f84..c768e72 100644 --- a/absl/base/config.h +++ b/absl/base/config.h @@ -56,6 +56,13 @@ #include <cstddef> #endif // __cplusplus +#if defined(__APPLE__) +// Included for TARGET_OS_IPHONE, __IPHONE_OS_VERSION_MIN_REQUIRED, +// __IPHONE_8_0. +#include <Availability.h> +#include <TargetConditionals.h> +#endif + #include "absl/base/policy_checks.h" // ----------------------------------------------------------------------------- @@ -151,12 +158,13 @@ // // Checks whether C++11's `thread_local` storage duration specifier is // supported. -// -// Notes: Clang implements the `thread_local` keyword but Xcode did not support -// the implementation until Xcode 8. #ifdef ABSL_HAVE_THREAD_LOCAL #error ABSL_HAVE_THREAD_LOCAL cannot be directly set -#elif !defined(__apple_build_version__) || __apple_build_version__ >= 8000042 +#elif !defined(__apple_build_version__) || \ + ((__apple_build_version__ >= 8000042) && \ + !(TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_8_0)) +// Notes: Xcode's clang did not support `thread_local` until version +// 8, and even then not for iOS < 8.0. #define ABSL_HAVE_THREAD_LOCAL 1 #endif |