summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Boehm <hboehm@google.com>2014-08-07 19:02:55 -0700
committerHans Boehm <hboehm@google.com>2014-08-07 19:02:55 -0700
commit9e42984d7ecb5654a63d76339bfb9d99e57ba9c8 (patch)
treea4c2cf65ab3075ebd52d78764cf0870d3801070c
parent7a845bc1b24d53a9071a66294c77bdbd925a3b3f (diff)
downloadx86_64-linux-glibc2.11-4.8-9e42984d7ecb5654a63d76339bfb9d99e57ba9c8.tar.gz
Include required definitions from stdint.h
Bug:16874785 Change-Id: If7fddb444c2a0669c9f32d1031e93ce4fd9dce12
-rw-r--r--sysroot/usr/include/stdatomic.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sysroot/usr/include/stdatomic.h b/sysroot/usr/include/stdatomic.h
index 7d46dc9..febf9ae 100644
--- a/sysroot/usr/include/stdatomic.h
+++ b/sysroot/usr/include/stdatomic.h
@@ -33,6 +33,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
#include <stdbool.h>
+#include <stdint.h> // TODO: Should pollute namespace less
// NOTE: Defining __CLANG_ATOMICS when __clang__ is defined does not work and results in
// broken "make checkbuild".
@@ -203,7 +204,9 @@ typedef _Atomic(long) atomic_long;
typedef _Atomic(unsigned long) atomic_ulong;
typedef _Atomic(long long) atomic_llong;
typedef _Atomic(unsigned long long) atomic_ullong;
-#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
+#if __cplusplus >= 201103L
+ // Should define these for C11 as well, but only after including
+ // char16_t and char32_t definitions.
typedef _Atomic(char16_t) atomic_char16_t;
typedef _Atomic(char32_t) atomic_char32_t;
#endif