diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-10-08 22:25:27 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2015-10-08 22:25:27 +0000 |
| commit | d6cffc4fe067f4fbfbaed8b514df89a3323e33fc (patch) | |
| tree | 2facc78ab6be225506e7a210903269d88747b31d /libcxx/include/cstddef | |
| parent | e3c2626aa44c65fb0f3606e5c906570757c9711e (diff) | |
| download | bcm5719-llvm-d6cffc4fe067f4fbfbaed8b514df89a3323e33fc.tar.gz bcm5719-llvm-d6cffc4fe067f4fbfbaed8b514df89a3323e33fc.zip | |
Split <stddef.h> out of <cstddef>.
There are a bunch of macros (__need_size_t etc) that request just one piece of
<stddef.h>; if any one of these is defined, we just directly include the
underlying header.
Note that <stddef.h> provides a ::nullptr_t. We don't want that available to
includers of <cstddef>, so instead of following the usual pattern where <cfoo>
includes <foo.h> then pulls things from :: into std:: with using-declarations,
we implement <stddef.h> and <cstddef> separately; both include <__nullptr> for
the definition of std::nullptr_t.
llvm-svn: 249761
Diffstat (limited to 'libcxx/include/cstddef')
| -rw-r--r-- | libcxx/include/cstddef | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/cstddef b/libcxx/include/cstddef index 68f52c2458c..1210b91987d 100644 --- a/libcxx/include/cstddef +++ b/libcxx/include/cstddef @@ -34,10 +34,10 @@ Types: */ #include <__config> +// Don't include our own <stddef.h>; we don't want to declare ::nullptr_t. +#include_next <stddef.h> #include <__nullptr> -#include <stddef.h> - #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) #pragma GCC system_header #endif |
