summaryrefslogtreecommitdiffstats
path: root/libcxx/include/cstdlib
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-08-15 21:19:08 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-08-15 21:19:08 +0000
commit171c77b7dad4a050aca23ff7ca1b75f87560fefb (patch)
tree6e19d3c7bf7e6d2f1b2867adcc984453f9192209 /libcxx/include/cstdlib
parent9a389fbd79dc0681e898a2e40a00cbbe1b3eba72 (diff)
downloadbcm5719-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/cstdlib')
-rw-r--r--libcxx/include/cstdlib4
1 files changed, 2 insertions, 2 deletions
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
OpenPOWER on IntegriCloud