diff options
| author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-20 22:11:12 +0300 |
|---|---|---|
| committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-20 22:11:12 +0300 |
| commit | f2fb45ac1bf02ff7d5a1414a493b5d7040dd3cef (patch) | |
| tree | c958e0533e46fe19c208a07531f1519956443bca | |
| parent | e7aae615944a704e320aaea56e0cebfa2dcf2959 (diff) | |
| download | ydb-f2fb45ac1bf02ff7d5a1414a493b5d7040dd3cef.tar.gz | |
intermediate changes
ref:ac69799db1f6e61306109e53aaaa1a48754b4a72
| -rw-r--r-- | build/sysincl/libc-to-musl.yml | 1 | ||||
| -rwxr-xr-x | build/ymake_conf.py | 5 | ||||
| -rw-r--r-- | contrib/libs/libxml/include/libxml/encoding.h | 2 | ||||
| -rw-r--r-- | library/cpp/coroutine/engine/stack/stack_utils.cpp | 1 | ||||
| -rw-r--r-- | library/cpp/unicode/punycode/punycode.cpp | 4 | ||||
| -rw-r--r-- | library/cpp/uri/assign.cpp | 2 |
6 files changed, 9 insertions, 6 deletions
diff --git a/build/sysincl/libc-to-musl.yml b/build/sysincl/libc-to-musl.yml index 810dd8d697..5778acefdd 100644 --- a/build/sysincl/libc-to-musl.yml +++ b/build/sysincl/libc-to-musl.yml @@ -122,7 +122,6 @@ - getopt.h: contrib/libs/musl/include/getopt.h - glob.h: contrib/libs/musl/include/glob.h - grp.h: contrib/libs/musl/include/grp.h - - iconv.h: contrib/libs/musl/include/iconv.h - ifaddrs.h: contrib/libs/musl/include/ifaddrs.h - iso646.h: contrib/libs/musl/include/iso646.h - langinfo.h: contrib/libs/musl/include/langinfo.h diff --git a/build/ymake_conf.py b/build/ymake_conf.py index 7b80b39c98..8a165e31ca 100755 --- a/build/ymake_conf.py +++ b/build/ymake_conf.py @@ -2386,6 +2386,11 @@ class MSVCCompiler(MSVC, Compiler): '/DWIN32', '/D_WIN32', '/D_WINDOWS', + # Define _CRT_*_NO_WARNINGS macros to prevent ucrt from issuing a warning whenever + # a POSIX-style function is used instead of the alternative Microsoft suggests as a secure / standard replacement + # (e. g. `strncpy()` instead of `strncpy_s()`, `access()` instead of `_access()`) + # For details see: + # https://docs.microsoft.com/en-us/cpp/c-runtime-library/security-features-in-the-crt '/D_CRT_SECURE_NO_WARNINGS', '/D_CRT_NONSTDC_NO_WARNINGS', # Math constants (such as M_PI, M_E, M_SQRT2) are not defined in standard C / C++ diff --git a/contrib/libs/libxml/include/libxml/encoding.h b/contrib/libs/libxml/include/libxml/encoding.h index e3582bf149..df8c2ef1f7 100644 --- a/contrib/libs/libxml/include/libxml/encoding.h +++ b/contrib/libs/libxml/include/libxml/encoding.h @@ -25,7 +25,7 @@ #include "xmlversion.h" #ifdef LIBXML_ICONV_ENABLED -#include <contrib/libs/libiconv/iconv.h> +#include <iconv.h> #endif #ifdef LIBXML_ICU_ENABLED #include <unicode/ucnv.h> diff --git a/library/cpp/coroutine/engine/stack/stack_utils.cpp b/library/cpp/coroutine/engine/stack/stack_utils.cpp index d3076be2c5..6865772e32 100644 --- a/library/cpp/coroutine/engine/stack/stack_utils.cpp +++ b/library/cpp/coroutine/engine/stack/stack_utils.cpp @@ -1,6 +1,5 @@ #include "stack_utils.h" -#include <contrib/libs/linux-headers/asm-generic/errno-base.h> #include <util/generic/scope.h> #include <util/system/yassert.h> diff --git a/library/cpp/unicode/punycode/punycode.cpp b/library/cpp/unicode/punycode/punycode.cpp index 54edfe4579..c5817a7b5d 100644 --- a/library/cpp/unicode/punycode/punycode.cpp +++ b/library/cpp/unicode/punycode/punycode.cpp @@ -1,6 +1,6 @@ #include "punycode.h" -#include <contrib/libs/libidn/lib/idna.h> -#include <contrib/libs/libidn/lib/punycode.h> +#include <idna.h> +#include <punycode.h> #include <util/charset/wide.h> #include <util/generic/ptr.h> #include <util/generic/vector.h> diff --git a/library/cpp/uri/assign.cpp b/library/cpp/uri/assign.cpp index 622e70a542..224b0ff6ef 100644 --- a/library/cpp/uri/assign.cpp +++ b/library/cpp/uri/assign.cpp @@ -1,7 +1,7 @@ #include "uri.h" #include "parse.h" -#include <contrib/libs/libidn/lib/idna.h> +#include <idna.h> #include <library/cpp/charset/recyr.hh> #include <util/charset/wide.h> |