diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-08 19:54:04 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2015-01-09 11:10:24 +0800 |
| commit | 45b1d17d3c24e23b0955928e62881e6fd0f7b8c5 (patch) | |
| tree | 9bcebab2edecf9266c332587fdd56fac8b3836c0 /9/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef | |
| parent | 8226f95d450857358fd08319a906c83739bd5035 (diff) | |
| download | prebuilts_ndk-45b1d17d3c24e23b0955928e62881e6fd0f7b8c5.zip prebuilts_ndk-45b1d17d3c24e23b0955928e62881e6fd0f7b8c5.tar.gz prebuilts_ndk-45b1d17d3c24e23b0955928e62881e6fd0f7b8c5.tar.bz2 | |
Update llvm-libc++
NDK r10d
Change-Id: Ibb4c6a25904ab353d6f976f45ea35179c604287f
Diffstat (limited to '9/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef')
| -rw-r--r-- | 9/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/9/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef b/9/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef index 0030ec2..b4a2283 100644 --- a/9/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef +++ b/9/sources/cxx-stl/llvm-libc++/libcxx/include/cstddef @@ -35,12 +35,6 @@ Types: #include <__config> -#ifdef __GLIBC__ -#define __need_NULL -#define __need_ptrdiff_t -#define __need_size_t -#endif // __GLIBC__ - #include <stddef.h> #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) @@ -55,6 +49,11 @@ using ::size_t; #if defined(__CLANG_MAX_ALIGN_T_DEFINED) || defined(_GCC_MAX_ALIGN_T) // Re-use the compiler's <stddef.h> max_align_t where possible. using ::max_align_t; +#elif defined(__ANDROID__) && !__LP64__ +// If compiler doesn't have max_align_t (ie. clang), and it's on 32-bit Android, typedef max_align_t to +// "long long" instead of "long double" because 32-bit Android treats "long double" the same as "double" +// which is smaller than "long long" +typedef long long max_align_t; #else typedef long double max_align_t; #endif |