aboutsummaryrefslogtreecommitdiff
path: root/lib/include/stdatomic.h
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-07-28 11:54:23 -0700
committerAndrew Kelley <andrew@ziglang.org>2022-07-28 11:54:23 -0700
commitd3389eadf42417deae2d9ba01f9529be861fb998 (patch)
tree2a6037fd6085762be5e99cbb390f3157c4b22b1c /lib/include/stdatomic.h
parentadb4a953021aadcfd539589eeccc2fe4e6ab827a (diff)
downloadzig-d3389eadf42417deae2d9ba01f9529be861fb998.tar.gz
zig-d3389eadf42417deae2d9ba01f9529be861fb998.zip
update C headers to LLVM 15
release/15.x 37007475ca1b345b4c5d340e228bcd7a62732d81
Diffstat (limited to 'lib/include/stdatomic.h')
-rw-r--r--lib/include/stdatomic.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/include/stdatomic.h b/lib/include/stdatomic.h
index 780bcc2dfe..318c7ca56e 100644
--- a/lib/include/stdatomic.h
+++ b/lib/include/stdatomic.h
@@ -17,7 +17,8 @@
* explicitly disallows `stdatomic.h` in the C mode via an `#error`. Fallback
* to the clang resource header until that is fully supported.
*/
-#if __STDC_HOSTED__ && __has_include_next(<stdatomic.h>) && !defined(_MSC_VER)
+#if __STDC_HOSTED__ && \
+ __has_include_next(<stdatomic.h>) && !(defined(_MSC_VER) && !defined(__cplusplus))
# include_next <stdatomic.h>
#else
@@ -158,10 +159,6 @@ typedef _Atomic(uintmax_t) atomic_uintmax_t;
typedef struct atomic_flag { atomic_bool _Value; } atomic_flag;
#define ATOMIC_FLAG_INIT { 0 }
-#if __cplusplus >= 202002L && !defined(_CLANG_DISABLE_CRT_DEPRECATION_WARNINGS)
-/* ATOMIC_FLAG_INIT was deprecated in C++20 but is not deprecated in C. */
-#pragma clang deprecated(ATOMIC_FLAG_INIT)
-#endif
/* These should be provided by the libc implementation. */
#ifdef __cplusplus