tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Include uchar.h only for bionic

Browse source 
Bug: http://b/111265772

uchar.h is not available in the glibc used for the host.  Since Bionic's
stdatomic.h is also used for the host (via a copy in prebuilts/clang)
guard the include with a check for __BIONIC__.

Also replace the check for C11 around definition of
atomic_char_{16,32}_t with a check for __BIONIC__.  While we're here,
check if __cplusplus is defined before checking its value.  This avoids
a potential -Wundef warning.

Test: Build
Change-Id: Icb62150d978703175b78d8ad12b42cf98b424b9a
This commit is contained in:
Pirama Arumuga Nainar 2018-07-09 11:42:23 -07:00
parent 57fe8130af
commit 6c0eab9c5b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libc/include/stdatomic.h
View file

@ -143,10 +143,10 @@ using std::atomic_uintmax_t;
#include <stddef.h> /* For ptrdiff_t. */
#include <stdint.h> /* TODO: don't drag in all the macros, just the types. */
// Include uchar.h only when needed. Bionic's stdatomic.h is also used for the
// host (via a copy in prebuilts/clang) and uchar.h is not available in the
// Include uchar.h only when available. Bionic's stdatomic.h is also used for
// the host (via a copy in prebuilts/clang) and uchar.h is not available in the
// glibc used for the host.
#if __STDC_VERSION__ >= 201112L
#if defined(__BIONIC__)
# include <uchar.h> /* For char16_t and char32_t. */
#endif
@ -327,7 +327,7 @@ 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 defined(__BIONIC__) || (defined(__cplusplus) && __cplusplus >= 201103L)
typedef _Atomic(char16_t) atomic_char16_t;
typedef _Atomic(char32_t) atomic_char32_t;
#endif