From 171c77b7dad4a050aca23ff7ca1b75f87560fefb Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Wed, 15 Aug 2018 21:19:08 +0000 Subject: 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 --- libcxx/include/cstdlib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libcxx/include/cstdlib') 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 -- cgit v1.2.3