diff options
| author | Hans Boehm <hboehm@google.com> | 2014-07-17 00:41:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-16 23:31:38 +0000 |
| commit | 43363ab7202a935e12cf6a38d32a48433bdc3705 (patch) | |
| tree | b0230c07aac21781e1f124876629a164f4dc299f /libc | |
| parent | 94f84d36a9f16030546a667bab6c66a59e41e4bd (diff) | |
| parent | 8b002362d996859ebfc8588d6859a9a79203dc27 (diff) | |
| download | android_bionic-43363ab7202a935e12cf6a38d32a48433bdc3705.tar.gz android_bionic-43363ab7202a935e12cf6a38d32a48433bdc3705.tar.bz2 android_bionic-43363ab7202a935e12cf6a38d32a48433bdc3705.zip | |
Merge "Define atomic_charN_t only if charN_t is supported."
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/stdatomic.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libc/include/stdatomic.h b/libc/include/stdatomic.h index 43ec7534b..669cefd66 100644 --- a/libc/include/stdatomic.h +++ b/libc/include/stdatomic.h @@ -205,8 +205,10 @@ typedef _Atomic(long) atomic_long; typedef _Atomic(unsigned long) atomic_ulong; typedef _Atomic(long long) atomic_llong; typedef _Atomic(unsigned long long) atomic_ullong; -typedef _Atomic(char16_t) atomic_char16_t; -typedef _Atomic(char32_t) atomic_char32_t; +#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L + typedef _Atomic(char16_t) atomic_char16_t; + typedef _Atomic(char32_t) atomic_char32_t; +#endif typedef _Atomic(wchar_t) atomic_wchar_t; typedef _Atomic(int_least8_t) atomic_int_least8_t; typedef _Atomic(uint_least8_t) atomic_uint_least8_t; |