diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-06-30 21:18:19 +0000 |
| commit | ce48a1137d56d368828d360e5f2a8162bac6517c (patch) | |
| tree | ec224d56b3d3a54fafbd14126993b38671f4ebec /libcxx/include/cstddef | |
| parent | 070f96c567f7b0b3a0aa03178d2b6f05cdb2e447 (diff) | |
| download | bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.tar.gz bcm5719-llvm-ce48a1137d56d368828d360e5f2a8162bac6517c.zip | |
_STD -> _VSTD to avoid macro clash on windows
llvm-svn: 134190
Diffstat (limited to 'libcxx/include/cstddef')
| -rw-r--r-- | libcxx/include/cstddef | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/include/cstddef b/libcxx/include/cstddef index 53ef27250dd..b851ea00926 100644 --- a/libcxx/include/cstddef +++ b/libcxx/include/cstddef @@ -82,7 +82,7 @@ struct _LIBCPP_VISIBLE nullptr_t inline _LIBCPP_ALWAYS_INLINE nullptr_t __get_nullptr_t() {return nullptr_t(0);} -#define nullptr _STD::__get_nullptr_t() +#define nullptr _VSTD::__get_nullptr_t() #endif // _LIBCPP_HAS_NO_NULLPTR |
