diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2018-08-15 21:19:08 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2018-08-15 21:19:08 +0000 |
| commit | 171c77b7dad4a050aca23ff7ca1b75f87560fefb (patch) | |
| tree | 6e19d3c7bf7e6d2f1b2867adcc984453f9192209 /libcxx/include | |
| parent | 9a389fbd79dc0681e898a2e40a00cbbe1b3eba72 (diff) | |
| download | bcm5719-llvm-171c77b7dad4a050aca23ff7ca1b75f87560fefb.tar.gz bcm5719-llvm-171c77b7dad4a050aca23ff7ca1b75f87560fefb.zip | |
Selectively import timespec_get into namespace std, since some C libraries don't have it. Reviewed as https://reviews.llvm.org/D50799
llvm-svn: 339816
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/__config | 3 | ||||
| -rw-r--r-- | libcxx/include/cstdlib | 4 | ||||
| -rw-r--r-- | libcxx/include/ctime | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/libcxx/include/__config b/libcxx/include/__config index cd2a1354157..06af4dc61a3 100644 --- a/libcxx/include/__config +++ b/libcxx/include/__config @@ -334,6 +334,7 @@ # define _LIBCPP_HAS_C11_FEATURES # elif defined(__Fuchsia__) # define _LIBCPP_HAS_QUICK_EXIT +# define _LIBCPP_HAS_TIMESPEC_GET # define _LIBCPP_HAS_C11_FEATURES # elif defined(__linux__) # if !defined(_LIBCPP_HAS_MUSL_LIBC) @@ -342,9 +343,11 @@ # endif # if _LIBCPP_GLIBC_PREREQ(2, 17) # define _LIBCPP_HAS_C11_FEATURES +# define _LIBCPP_HAS_TIMESPEC_GET # endif # else // defined(_LIBCPP_HAS_MUSL_LIBC) # define _LIBCPP_HAS_QUICK_EXIT +# define _LIBCPP_HAS_TIMESPEC_GET # define _LIBCPP_HAS_C11_FEATURES # endif # endif // __linux__ diff --git a/libcxx/include/cstdlib b/libcxx/include/cstdlib index 78c428403c3..00c604e6762 100644 --- a/libcxx/include/cstdlib +++ b/libcxx/include/cstdlib @@ -151,11 +151,11 @@ using ::mbtowc; using ::wctomb; using ::mbstowcs; using ::wcstombs; -#ifdef _LIBCPP_HAS_QUICK_EXIT +#if !defined(_LIBCPP_CXX03_LANG) && defined(_LIBCPP_HAS_QUICK_EXIT) using ::at_quick_exit; using ::quick_exit; #endif -#ifdef _LIBCPP_HAS_C11_FEATURES +#if _LIBCPP_STD_VER > 14 && defined(_LIBCPP_HAS_C11_FEATURES) using ::aligned_alloc; #endif diff --git a/libcxx/include/ctime b/libcxx/include/ctime index 81cf11a466c..8264fe33b96 100644 --- a/libcxx/include/ctime +++ b/libcxx/include/ctime @@ -73,7 +73,7 @@ using ::gmtime; using ::localtime; #endif using ::strftime; -#if _LIBCPP_STD_VER > 14 && defined(_LIBCPP_HAS_C11_FEATURES) +#if _LIBCPP_STD_VER > 14 && defined(_LIBCPP_HAS_TIMESPEC_GET) using ::timespec_get; #endif |
