Drop more msvc-specific patches

20 files changed, 0 insertions, 129 deletions

diff --git a/contrib/libs/cxxsupp/libcxx/include/complex.h b/contrib/libs/cxxsupp/libcxx/include/complex.h
index 58cbbaaeef..a2814669c7 100644
--- a/contrib/libs/cxxsupp/libcxx/include/complex.h
+++ b/contrib/libs/cxxsupp/libcxx/include/complex.h
@@ -29,11 +29,7 @@
 
 #else  // __cplusplus
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(complex.h)
-#else
 #include_next <complex.h>
-#endif
 
 #endif // __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/ctype.h b/contrib/libs/cxxsupp/libcxx/include/ctype.h
index b1637504eb..ba0925069c 100644
--- a/contrib/libs/cxxsupp/libcxx/include/ctype.h
+++ b/contrib/libs/cxxsupp/libcxx/include/ctype.h
@@ -35,11 +35,7 @@ int toupper(int c);
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(ctype.h)
-#else
 #include_next <ctype.h>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/errno.h b/contrib/libs/cxxsupp/libcxx/include/errno.h
index 907a4f179e..ea0559f0f5 100644
--- a/contrib/libs/cxxsupp/libcxx/include/errno.h
+++ b/contrib/libs/cxxsupp/libcxx/include/errno.h
@@ -28,20 +28,7 @@ Macros:
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-// errno is defined in several files so we can't use #ifndef errno here
-#ifdef errno
-// undefine errno to avoid substitution in errno.h include file name.
-#pragma push_macro("errno")
-#undef errno
-#include Y_UCRT_INCLUDE_NEXT(errno.h)
-#pragma pop_macro("errno")
-#else
-#include Y_UCRT_INCLUDE_NEXT(errno.h)
-#endif
-#else
 #include_next <errno.h>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/fenv.h b/contrib/libs/cxxsupp/libcxx/include/fenv.h
index 5a8cebf65f..a9ba680024 100644
--- a/contrib/libs/cxxsupp/libcxx/include/fenv.h
+++ b/contrib/libs/cxxsupp/libcxx/include/fenv.h
@@ -56,11 +56,7 @@ int feupdateenv(const fenv_t* envp);
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(fenv.h)
-#else
 #include_next <fenv.h>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/float.h b/contrib/libs/cxxsupp/libcxx/include/float.h
index 6479a0107c..606081251d 100644
--- a/contrib/libs/cxxsupp/libcxx/include/float.h
+++ b/contrib/libs/cxxsupp/libcxx/include/float.h
@@ -76,11 +76,7 @@ Macros:
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(float.h)
-#else
 #include_next <float.h>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/initializer_list b/contrib/libs/cxxsupp/libcxx/include/initializer_list
index f18f93316f..18254801ec 100644
--- a/contrib/libs/cxxsupp/libcxx/include/initializer_list
+++ b/contrib/libs/cxxsupp/libcxx/include/initializer_list
@@ -46,13 +46,6 @@ template<class E> const E* end(initializer_list<E> il) noexcept; // constexpr in
 #include <__config>
 #include <cstddef>
 
-#if defined(_LIBCPP_COMPILER_MSVC) && !defined(__clang__)
-
-#include Y_MSVC_INCLUDE_NEXT(yvals.h)
-#include Y_MSVC_INCLUDE_NEXT(initializer_list)
-
-#else
-
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #  pragma GCC system_header
 #endif
@@ -127,6 +120,4 @@ end(initializer_list<_Ep> __il) _NOEXCEPT
 
 } // namespace std
 
-#endif // _LIBCPP_COMPILER_MSVC
-
 #endif // _LIBCPP_INITIALIZER_LIST
diff --git a/contrib/libs/cxxsupp/libcxx/include/inttypes.h b/contrib/libs/cxxsupp/libcxx/include/inttypes.h
index 5873e3f647..e0fd71f9b6 100644
--- a/contrib/libs/cxxsupp/libcxx/include/inttypes.h
+++ b/contrib/libs/cxxsupp/libcxx/include/inttypes.h
@@ -248,11 +248,7 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int
 #   define __STDC_FORMAT_MACROS
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(inttypes.h)
-#else
 #include_next <inttypes.h>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/limits.h b/contrib/libs/cxxsupp/libcxx/include/limits.h
index 51ff28eefd..3e1e85a8a0 100644
--- a/contrib/libs/cxxsupp/libcxx/include/limits.h
+++ b/contrib/libs/cxxsupp/libcxx/include/limits.h
@@ -44,11 +44,7 @@ Macros:
 #endif
 
 #ifndef __GNUC__
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_MSVC_INCLUDE_NEXT(limits.h)
-#else
 #include_next <limits.h>
-#endif
 #else
 // GCC header limits.h recursively includes itself through another header called
 // syslimits.h for some reason. This setup breaks down if we directly
diff --git a/contrib/libs/cxxsupp/libcxx/include/locale.h b/contrib/libs/cxxsupp/libcxx/include/locale.h
index 03d5783048..17c0a705a0 100644
--- a/contrib/libs/cxxsupp/libcxx/include/locale.h
+++ b/contrib/libs/cxxsupp/libcxx/include/locale.h
@@ -43,10 +43,6 @@ Functions:
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(locale.h)
-#else
 #include_next <locale.h>
-#endif
 
 #endif // _LIBCPP_LOCALE_H
diff --git a/contrib/libs/cxxsupp/libcxx/include/math.h b/contrib/libs/cxxsupp/libcxx/include/math.h
index d1513afd18..45c81aa3b9 100644
--- a/contrib/libs/cxxsupp/libcxx/include/math.h
+++ b/contrib/libs/cxxsupp/libcxx/include/math.h
@@ -297,11 +297,7 @@ long double    truncl(long double x);
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(math.h)
-#else
 #include_next <math.h>
-#endif
 
 #ifdef __cplusplus
 
@@ -1761,11 +1757,7 @@ trunc(_A1 __lcpp_x) _NOEXCEPT
 // and receive the definitions of mathematical constants, even if <math.h>
 // has previously been included.
 #if defined(_LIBCPP_MSVCRT) && defined(_USE_MATH_DEFINES)
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(math.h)
-#else
 #include_next <math.h>
 #endif
-#endif
 
 #endif // _LIBCPP_MATH_H
diff --git a/contrib/libs/cxxsupp/libcxx/include/setjmp.h b/contrib/libs/cxxsupp/libcxx/include/setjmp.h
index fca41aa31b..de4f9edf48 100644
--- a/contrib/libs/cxxsupp/libcxx/include/setjmp.h
+++ b/contrib/libs/cxxsupp/libcxx/include/setjmp.h
@@ -31,11 +31,7 @@ void longjmp(jmp_buf env, int val);
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_MSVC_INCLUDE_NEXT(setjmp.h)
-#else
 #include_next <setjmp.h>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdbool.h b/contrib/libs/cxxsupp/libcxx/include/stdbool.h
index 03b838f4b0..0bc1aa8304 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdbool.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdbool.h
@@ -24,11 +24,7 @@ Macros:
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_MSVC_INCLUDE_NEXT(stdbool.h)
-#else
 #include_next <stdbool.h>
-#endif
 
 #ifdef __cplusplus
 #undef bool
diff --git a/contrib/libs/cxxsupp/libcxx/include/stddef.h b/contrib/libs/cxxsupp/libcxx/include/stddef.h
index 7b2c6464e5..19e344f2a0 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stddef.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stddef.h
@@ -14,11 +14,7 @@
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(stddef.h)
-#else
 #include_next <stddef.h>
-#endif
 
 #elif !defined(_LIBCPP_STDDEF_H)
 #define _LIBCPP_STDDEF_H
@@ -46,12 +42,7 @@ Types:
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(stddef.h)
-typedef double max_align_t;
-#else
 #include_next <stddef.h>
-#endif
 
 #ifdef __cplusplus
     typedef decltype(nullptr) nullptr_t;
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdint.h b/contrib/libs/cxxsupp/libcxx/include/stdint.h
index c9342a388e..ee71f62ab0 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdint.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdint.h
@@ -120,10 +120,6 @@ Macros:
 #   define __STDC_CONSTANT_MACROS
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_MSVC_INCLUDE_NEXT(stdint.h)
-#else
 #include_next <stdint.h>
-#endif
 
 #endif // _LIBCPP_STDINT_H
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdio.h b/contrib/libs/cxxsupp/libcxx/include/stdio.h
index d0ffec5fb0..ad1b4c05f1 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdio.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdio.h
@@ -13,11 +13,7 @@
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(stdio.h)
-#else
 #include_next <stdio.h>
-#endif
 
 #elif !defined(_LIBCPP_STDIO_H)
 #define _LIBCPP_STDIO_H
@@ -108,11 +104,7 @@ void perror(const char* s);
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(stdio.h)
-#else
 #include_next <stdio.h>
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdlib.h b/contrib/libs/cxxsupp/libcxx/include/stdlib.h
index 3edfa228a4..e4dce9c545 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdlib.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdlib.h
@@ -13,11 +13,7 @@
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(stdlib.h)
-#else
 #include_next <stdlib.h>
-#endif
 
 #elif !defined(_LIBCPP_STDLIB_H)
 #define _LIBCPP_STDLIB_H
@@ -94,20 +90,7 @@ void *aligned_alloc(size_t alignment, size_t size);                       // C11
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(stdlib.h)
-#ifdef __cplusplus
-extern "C" {
-#endif
-float fabsf(float);
-double fabs(double);
-long double fabsl(long double);
-#ifdef __cplusplus
-}
-#endif
-#else
 #include_next <stdlib.h>
-#endif
 
 #ifdef __cplusplus
 extern "C++" {
diff --git a/contrib/libs/cxxsupp/libcxx/include/string.h b/contrib/libs/cxxsupp/libcxx/include/string.h
index 099b6616ab..082c632a29 100644
--- a/contrib/libs/cxxsupp/libcxx/include/string.h
+++ b/contrib/libs/cxxsupp/libcxx/include/string.h
@@ -57,11 +57,7 @@ size_t strlen(const char* s);
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(string.h)
-#else
 #include_next <string.h>
-#endif
 
 // MSVCRT, GNU libc and its derivates may already have the correct prototype in
 // <string.h>. This macro can be defined by users if their C library provides
diff --git a/contrib/libs/cxxsupp/libcxx/include/wchar.h b/contrib/libs/cxxsupp/libcxx/include/wchar.h
index fd22a2715f..ce63cf2476 100644
--- a/contrib/libs/cxxsupp/libcxx/include/wchar.h
+++ b/contrib/libs/cxxsupp/libcxx/include/wchar.h
@@ -13,11 +13,7 @@
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(wchar.h)
-#else
 #include_next <wchar.h>
-#endif
 
 #elif !defined(_LIBCPP_WCHAR_H)
 #define _LIBCPP_WCHAR_H
@@ -124,11 +120,7 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
 #define __CORRECT_ISO_CPP_WCHAR_H_PROTO
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#include Y_UCRT_INCLUDE_NEXT(wchar.h)
-#else
 #include_next <wchar.h>
-#endif
 
 // Determine whether we have const-correct overloads for wcschr and friends.
 #if defined(_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)
diff --git a/contrib/libs/cxxsupp/libcxx/include/wctype.h b/contrib/libs/cxxsupp/libcxx/include/wctype.h
index 98d64739e5..e4dc61ad5c 100644
--- a/contrib/libs/cxxsupp/libcxx/include/wctype.h
+++ b/contrib/libs/cxxsupp/libcxx/include/wctype.h
@@ -54,10 +54,6 @@ wctrans_t wctrans(const char* property);
 #  pragma GCC system_header
 #endif
 
-#ifdef _LIBCPP_COMPILER_MSVC
-#   include Y_UCRT_INCLUDE_NEXT(wctype.h)
-#   define _LIBCPP_INCLUDED_C_LIBRARY_WCTYPE_H
-#else
 // TODO:
 // In the future, we should unconditionally include_next <wctype.h> here and instead
 // have a mode under which the library does not need libc++'s <wctype.h> or <cwctype>
@@ -71,7 +67,6 @@ wctrans_t wctrans(const char* property);
 #   include_next <wctype.h>
 #   define _LIBCPP_INCLUDED_C_LIBRARY_WCTYPE_H
 #endif
-#endif
 
 #ifdef __cplusplus
 
diff --git a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
index 409d6755f6..3ee2d21b68 100644
--- a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
+++ b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
@@ -16,13 +16,6 @@
 
 #include <__config>
 
-#ifdef _LIBCPP_COMPILER_MSVC
-// We don't want to depend on MSVC headers but
-// we have conflicting definitions otherwise due to
-// some other dependency on eh.h.
-#include Y_MSVC_INCLUDE_NEXT(eh.h)
-
-#else
 extern "C" {
 typedef void (__cdecl* terminate_handler)();
 _LIBCPP_CRT_FUNC terminate_handler __cdecl set_terminate(
@@ -36,7 +29,6 @@ unexpected_handler __cdecl _get_unexpected();
 
 int __cdecl __uncaught_exceptions();
 }
-#endif
 
 namespace std {