From 265b83a87f2bc31bb31fd7a0802b030f96c617a0 Mon Sep 17 00:00:00 2001
From: Chandler Carruth <chandlerc@gmail.com>
Date: Fri, 21 Feb 2014 08:37:30 +0000
Subject: Teach libc++ to use the compiler-provided C-compatible ::max_align_t
 rather than its own type for std::max_align_t. This is particularly relevant
 as the types may not be ABI compatible despite users expecting them to be.

llvm-svn: 201843
---
 libcxx/include/cstddef | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libcxx/include/cstddef')

diff --git a/libcxx/include/cstddef b/libcxx/include/cstddef
index 7ef16ff2a36..0030ec289a8 100644
--- a/libcxx/include/cstddef
+++ b/libcxx/include/cstddef
@@ -52,7 +52,12 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 using ::ptrdiff_t;
 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;
+#else
 typedef long double max_align_t;
+#endif
 
 #ifdef _LIBCPP_HAS_NO_NULLPTR
 
-- 
cgit v1.2.3