10-using_if_exists-in-clang11-and-msvcrt.patch 1.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. diff --git a/include/cstdlib b/include/cstdlib
  2. index 9bf0ea3..d9ee863 100644
  3. --- a/include/cstdlib
  4. +++ b/include/cstdlib
  5. @@ -142,11 +142,11 @@ using ::wctomb _LIBCPP_USING_IF_EXISTS;
  6. using ::mbstowcs _LIBCPP_USING_IF_EXISTS;
  7. using ::wcstombs _LIBCPP_USING_IF_EXISTS;
  8. #endif
  9. -#if !defined(_LIBCPP_CXX03_LANG)
  10. +#if !defined(_LIBCPP_CXX03_LANG) && __has_attribute(using_if_exists)
  11. using ::at_quick_exit _LIBCPP_USING_IF_EXISTS;
  12. using ::quick_exit _LIBCPP_USING_IF_EXISTS;
  13. #endif
  14. -#if _LIBCPP_STD_VER >= 17
  15. +#if _LIBCPP_STD_VER >= 17 && __has_attribute(using_if_exists) && !defined(_LIBCPP_MSVCRT)
  16. using ::aligned_alloc _LIBCPP_USING_IF_EXISTS;
  17. #endif
  18. diff --git a/include/ctime b/include/ctime
  19. index b61e19d..e537bbe 100644
  20. --- a/include/ctime
  21. +++ b/include/ctime
  22. @@ -66,7 +66,7 @@ using ::clock_t _LIBCPP_USING_IF_EXISTS;
  23. using ::size_t _LIBCPP_USING_IF_EXISTS;
  24. using ::time_t _LIBCPP_USING_IF_EXISTS;
  25. using ::tm _LIBCPP_USING_IF_EXISTS;
  26. -#if _LIBCPP_STD_VER >= 17
  27. +#if _LIBCPP_STD_VER >= 17 && __has_attribute(using_if_exists)
  28. using ::timespec _LIBCPP_USING_IF_EXISTS;
  29. #endif
  30. using ::clock _LIBCPP_USING_IF_EXISTS;
  31. @@ -78,7 +78,7 @@ using ::ctime _LIBCPP_USING_IF_EXISTS;
  32. using ::gmtime _LIBCPP_USING_IF_EXISTS;
  33. using ::localtime _LIBCPP_USING_IF_EXISTS;
  34. using ::strftime _LIBCPP_USING_IF_EXISTS;
  35. -#if _LIBCPP_STD_VER >= 17
  36. +#if _LIBCPP_STD_VER >= 17 && __has_attribute(using_if_exists)
  37. using ::timespec_get _LIBCPP_USING_IF_EXISTS;
  38. #endif