diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 10:22:43 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-08-30 12:36:28 +0000 |
| commit | 271a6c3487a14599023a9106329505597638d793 (patch) | |
| tree | e040d58ffc86c1480b79ca8528020ca9ec919bf8 /chromium/third_party/abseil-cpp/absl/base/config.h | |
| parent | 7b2ffa587235a47d4094787d72f38102089f402a (diff) | |
| download | qtwebengine-chromium-271a6c3487a14599023a9106329505597638d793.tar.gz | |
BASELINE: Update Chromium to 77.0.3865.59
Change-Id: I1e89a5f3b009a9519a6705102ad65c92fe736f21
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/abseil-cpp/absl/base/config.h')
| -rw-r--r-- | chromium/third_party/abseil-cpp/absl/base/config.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chromium/third_party/abseil-cpp/absl/base/config.h b/chromium/third_party/abseil-cpp/absl/base/config.h index 2a14fe74063..406a931f485 100644 --- a/chromium/third_party/abseil-cpp/absl/base/config.h +++ b/chromium/third_party/abseil-cpp/absl/base/config.h @@ -181,6 +181,13 @@ #endif #endif // defined(__ANDROID__) && defined(__clang__) +// Emscripten doesn't yet support `thread_local` or `__thread`. +// https://github.com/emscripten-core/emscripten/issues/3502 +#if defined(__EMSCRIPTEN__) +#undef ABSL_HAVE_TLS +#undef ABSL_HAVE_THREAD_LOCAL +#endif // defined(__EMSCRIPTEN__) + // ABSL_HAVE_INTRINSIC_INT128 // // Checks whether the __int128 compiler extension for a 128-bit integral type is @@ -368,7 +375,7 @@ // https://github.com/abseil/abseil-cpp/issues/207 and // https://developer.apple.com/documentation/xcode_release_notes/xcode_10_release_notes #if defined(__APPLE__) && defined(_LIBCPP_VERSION) && \ - defined(__MAC_OS_X_VERSION_MIN_REQUIRED__) && \ + defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && \ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101400 #define ABSL_INTERNAL_MACOS_CXX17_TYPES_UNAVAILABLE 1 #else |