Resolve Y_UCRT_INCLUDE_NEXT and _LIBCPP_MSVC_INCLUDE to void

21 files changed, 29 insertions, 29 deletions

diff --git a/contrib/libs/cxxsupp/libcxx/include/__config b/contrib/libs/cxxsupp/libcxx/include/__config
index 1a10a448f6..dd3640f079 100644
--- a/contrib/libs/cxxsupp/libcxx/include/__config
+++ b/contrib/libs/cxxsupp/libcxx/include/__config
@@ -42,8 +42,8 @@
 #  define _LIBCPP_STD_VER 14
 #endif
 
-#define _LIBCPP_UCRT_INCLUDE(x) <Y_UCRT_INCLUDE/x>
-#define _LIBCPP_MSVC_INCLUDE(x) <Y_MSVC_INCLUDE/x>
+#define Y_UCRT_INCLUDE_NEXT(x) <Y_UCRT_INCLUDE/x>
+#define Y_MSVC_INCLUDE_NEXT(x) <Y_MSVC_INCLUDE/x>
 #elif defined(__IBMCPP__)
 #define _LIBCPP_COMPILER_IBM
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/complex.h b/contrib/libs/cxxsupp/libcxx/include/complex.h
index a710f840c1..58cbbaaeef 100644
--- a/contrib/libs/cxxsupp/libcxx/include/complex.h
+++ b/contrib/libs/cxxsupp/libcxx/include/complex.h
@@ -30,7 +30,7 @@
 #else  // __cplusplus
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(complex.h)
+#include Y_UCRT_INCLUDE_NEXT(complex.h)
 #else
 #include_next <complex.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/ctype.h b/contrib/libs/cxxsupp/libcxx/include/ctype.h
index eab3adaf4a..b1637504eb 100644
--- a/contrib/libs/cxxsupp/libcxx/include/ctype.h
+++ b/contrib/libs/cxxsupp/libcxx/include/ctype.h
@@ -36,7 +36,7 @@ int toupper(int c);
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(ctype.h)
+#include Y_UCRT_INCLUDE_NEXT(ctype.h)
 #else
 #include_next <ctype.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/errno.h b/contrib/libs/cxxsupp/libcxx/include/errno.h
index 5e2a41caf5..907a4f179e 100644
--- a/contrib/libs/cxxsupp/libcxx/include/errno.h
+++ b/contrib/libs/cxxsupp/libcxx/include/errno.h
@@ -34,10 +34,10 @@ Macros:
 // undefine errno to avoid substitution in errno.h include file name.
 #pragma push_macro("errno")
 #undef errno
-#include _LIBCPP_UCRT_INCLUDE(errno.h)
+#include Y_UCRT_INCLUDE_NEXT(errno.h)
 #pragma pop_macro("errno")
 #else
-#include _LIBCPP_UCRT_INCLUDE(errno.h)
+#include Y_UCRT_INCLUDE_NEXT(errno.h)
 #endif
 #else
 #include_next <errno.h>
diff --git a/contrib/libs/cxxsupp/libcxx/include/fenv.h b/contrib/libs/cxxsupp/libcxx/include/fenv.h
index e144e40d18..5a8cebf65f 100644
--- a/contrib/libs/cxxsupp/libcxx/include/fenv.h
+++ b/contrib/libs/cxxsupp/libcxx/include/fenv.h
@@ -57,7 +57,7 @@ int feupdateenv(const fenv_t* envp);
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(fenv.h)
+#include Y_UCRT_INCLUDE_NEXT(fenv.h)
 #else
 #include_next <fenv.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/float.h b/contrib/libs/cxxsupp/libcxx/include/float.h
index b2fb2bdf62..6479a0107c 100644
--- a/contrib/libs/cxxsupp/libcxx/include/float.h
+++ b/contrib/libs/cxxsupp/libcxx/include/float.h
@@ -77,7 +77,7 @@ Macros:
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(float.h)
+#include Y_UCRT_INCLUDE_NEXT(float.h)
 #else
 #include_next <float.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/initializer_list b/contrib/libs/cxxsupp/libcxx/include/initializer_list
index 2f9a4fda7b..827f137fd5 100644
--- a/contrib/libs/cxxsupp/libcxx/include/initializer_list
+++ b/contrib/libs/cxxsupp/libcxx/include/initializer_list
@@ -47,8 +47,8 @@ template<class E> const E* end(initializer_list<E> il) noexcept; // constexpr in
 
 #if defined(_LIBCPP_COMPILER_MSVC) && !defined(__clang__)
 
-#include _LIBCPP_MSVC_INCLUDE(yvals.h)
-#include _LIBCPP_MSVC_INCLUDE(initializer_list)
+#include Y_MSVC_INCLUDE_NEXT(yvals.h)
+#include Y_MSVC_INCLUDE_NEXT(initializer_list)
 
 #else
 
diff --git a/contrib/libs/cxxsupp/libcxx/include/inttypes.h b/contrib/libs/cxxsupp/libcxx/include/inttypes.h
index 32fbaa8b45..5873e3f647 100644
--- a/contrib/libs/cxxsupp/libcxx/include/inttypes.h
+++ b/contrib/libs/cxxsupp/libcxx/include/inttypes.h
@@ -249,7 +249,7 @@ uintmax_t wcstoumax(const wchar_t* restrict nptr, wchar_t** restrict endptr, int
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(inttypes.h)
+#include Y_UCRT_INCLUDE_NEXT(inttypes.h)
 #else
 #include_next <inttypes.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/limits.h b/contrib/libs/cxxsupp/libcxx/include/limits.h
index fd61c49a40..51ff28eefd 100644
--- a/contrib/libs/cxxsupp/libcxx/include/limits.h
+++ b/contrib/libs/cxxsupp/libcxx/include/limits.h
@@ -45,7 +45,7 @@ Macros:
 
 #ifndef __GNUC__
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_MSVC_INCLUDE(limits.h)
+#include Y_MSVC_INCLUDE_NEXT(limits.h)
 #else
 #include_next <limits.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/locale.h b/contrib/libs/cxxsupp/libcxx/include/locale.h
index 7807196ef1..83b4bdfead 100644
--- a/contrib/libs/cxxsupp/libcxx/include/locale.h
+++ b/contrib/libs/cxxsupp/libcxx/include/locale.h
@@ -44,7 +44,7 @@ Functions:
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(locale.h)
+#include Y_UCRT_INCLUDE_NEXT(locale.h)
 #else
 #include_next <locale.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/math.h b/contrib/libs/cxxsupp/libcxx/include/math.h
index 93831ed463..a409b610f3 100644
--- a/contrib/libs/cxxsupp/libcxx/include/math.h
+++ b/contrib/libs/cxxsupp/libcxx/include/math.h
@@ -298,7 +298,7 @@ long double    truncl(long double x);
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(math.h)
+#include Y_UCRT_INCLUDE_NEXT(math.h)
 #else
 #include_next <math.h>
 #endif
@@ -1762,7 +1762,7 @@ trunc(_A1 __lcpp_x) _NOEXCEPT
 // has previously been included.
 #if defined(_LIBCPP_MSVCRT) && defined(_USE_MATH_DEFINES)
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(math.h)
+#include Y_UCRT_INCLUDE_NEXT(math.h)
 #else
 #include_next <math.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/setjmp.h b/contrib/libs/cxxsupp/libcxx/include/setjmp.h
index 59ac3dd932..fca41aa31b 100644
--- a/contrib/libs/cxxsupp/libcxx/include/setjmp.h
+++ b/contrib/libs/cxxsupp/libcxx/include/setjmp.h
@@ -32,7 +32,7 @@ void longjmp(jmp_buf env, int val);
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_MSVC_INCLUDE(setjmp.h)
+#include Y_MSVC_INCLUDE_NEXT(setjmp.h)
 #else
 #include_next <setjmp.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdbool.h b/contrib/libs/cxxsupp/libcxx/include/stdbool.h
index ae4eb18b89..c596f2441c 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdbool.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdbool.h
@@ -26,7 +26,7 @@ Macros:
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_MSVC_INCLUDE(stdbool.h)
+#include Y_MSVC_INCLUDE_NEXT(stdbool.h)
 #else
 #include_next <stdbool.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/stddef.h b/contrib/libs/cxxsupp/libcxx/include/stddef.h
index de58ac6c94..7b2c6464e5 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stddef.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stddef.h
@@ -15,7 +15,7 @@
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(stddef.h)
+#include Y_UCRT_INCLUDE_NEXT(stddef.h)
 #else
 #include_next <stddef.h>
 #endif
@@ -47,7 +47,7 @@ Types:
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(stddef.h)
+#include Y_UCRT_INCLUDE_NEXT(stddef.h)
 typedef double max_align_t;
 #else
 #include_next <stddef.h>
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdint.h b/contrib/libs/cxxsupp/libcxx/include/stdint.h
index 7f18857610..c9342a388e 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdint.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdint.h
@@ -121,7 +121,7 @@ Macros:
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_MSVC_INCLUDE(stdint.h)
+#include Y_MSVC_INCLUDE_NEXT(stdint.h)
 #else
 #include_next <stdint.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdio.h b/contrib/libs/cxxsupp/libcxx/include/stdio.h
index d1569d33d6..d0ffec5fb0 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdio.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdio.h
@@ -14,7 +14,7 @@
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(stdio.h)
+#include Y_UCRT_INCLUDE_NEXT(stdio.h)
 #else
 #include_next <stdio.h>
 #endif
@@ -109,7 +109,7 @@ void perror(const char* s);
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(stdio.h)
+#include Y_UCRT_INCLUDE_NEXT(stdio.h)
 #else
 #include_next <stdio.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/stdlib.h b/contrib/libs/cxxsupp/libcxx/include/stdlib.h
index a0d5990d9a..a5c4986a6a 100644
--- a/contrib/libs/cxxsupp/libcxx/include/stdlib.h
+++ b/contrib/libs/cxxsupp/libcxx/include/stdlib.h
@@ -14,7 +14,7 @@
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(stdlib.h)
+#include Y_UCRT_INCLUDE_NEXT(stdlib.h)
 #else
 #include_next <stdlib.h>
 #endif
@@ -95,7 +95,7 @@ void *aligned_alloc(size_t alignment, size_t size);                       // C11
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(stdlib.h)
+#include Y_UCRT_INCLUDE_NEXT(stdlib.h)
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/string.h b/contrib/libs/cxxsupp/libcxx/include/string.h
index e3fc69e1eb..099b6616ab 100644
--- a/contrib/libs/cxxsupp/libcxx/include/string.h
+++ b/contrib/libs/cxxsupp/libcxx/include/string.h
@@ -58,7 +58,7 @@ size_t strlen(const char* s);
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(string.h)
+#include Y_UCRT_INCLUDE_NEXT(string.h)
 #else
 #include_next <string.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/wchar.h b/contrib/libs/cxxsupp/libcxx/include/wchar.h
index 3610202008..fd22a2715f 100644
--- a/contrib/libs/cxxsupp/libcxx/include/wchar.h
+++ b/contrib/libs/cxxsupp/libcxx/include/wchar.h
@@ -14,7 +14,7 @@
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(wchar.h)
+#include Y_UCRT_INCLUDE_NEXT(wchar.h)
 #else
 #include_next <wchar.h>
 #endif
@@ -125,7 +125,7 @@ size_t wcsrtombs(char* restrict dst, const wchar_t** restrict src, size_t len,
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#include _LIBCPP_UCRT_INCLUDE(wchar.h)
+#include Y_UCRT_INCLUDE_NEXT(wchar.h)
 #else
 #include_next <wchar.h>
 #endif
diff --git a/contrib/libs/cxxsupp/libcxx/include/wctype.h b/contrib/libs/cxxsupp/libcxx/include/wctype.h
index e09e0a8a7b..98d64739e5 100644
--- a/contrib/libs/cxxsupp/libcxx/include/wctype.h
+++ b/contrib/libs/cxxsupp/libcxx/include/wctype.h
@@ -55,7 +55,7 @@ wctrans_t wctrans(const char* property);
 #endif
 
 #ifdef _LIBCPP_COMPILER_MSVC
-#   include _LIBCPP_UCRT_INCLUDE(wctype.h)
+#   include Y_UCRT_INCLUDE_NEXT(wctype.h)
 #   define _LIBCPP_INCLUDED_C_LIBRARY_WCTYPE_H
 #else
 // TODO:
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 4eb1803f0b..409d6755f6 100644
--- a/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
+++ b/contrib/libs/cxxsupp/libcxx/src/support/runtime/exception_msvc.ipp
@@ -20,7 +20,7 @@
 // We don't want to depend on MSVC headers but
 // we have conflicting definitions otherwise due to
 // some other dependency on eh.h.
-#include _LIBCPP_MSVC_INCLUDE(eh.h)
+#include Y_MSVC_INCLUDE_NEXT(eh.h)
 
 #else
 extern "C" {