diff options
| author | robot-contrib <robot-contrib@yandex-team.com> | 2022-08-13 11:43:23 +0300 |
|---|---|---|
| committer | robot-contrib <robot-contrib@yandex-team.com> | 2022-08-13 11:43:23 +0300 |
| commit | 663a71c87c74435c8fe839bdf69435fe8d2041fc (patch) | |
| tree | 5e48d5d467a4ac9ca6f23cee6af4686e6a3b1424 | |
| parent | 9f56b74635b15ccaa4ff881784be7ed8e3f18fe1 (diff) | |
| download | ydb-663a71c87c74435c8fe839bdf69435fe8d2041fc.tar.gz | |
Update contrib/restricted/aws/aws-c-common to 0.8.0
| -rw-r--r-- | contrib/restricted/aws/aws-c-common/source/common.c | 4 | ||||
| -rw-r--r-- | contrib/restricted/aws/aws-c-common/source/posix/system_info.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/contrib/restricted/aws/aws-c-common/source/common.c b/contrib/restricted/aws/aws-c-common/source/common.c index 39e0faf3a25..173cbd949c7 100644 --- a/contrib/restricted/aws/aws-c-common/source/common.c +++ b/contrib/restricted/aws/aws-c-common/source/common.c @@ -294,7 +294,7 @@ void aws_common_library_init(struct aws_allocator *allocator) { /* NUMA is funky and we can't rely on libnuma.so being available. We also don't want to take a hard dependency on it, * try and load it if we can. */ -#if !defined(_WIN32) && !defined(WIN32) +#ifdef AWS_OS_LINUX /* libnuma defines set_mempolicy() as a WEAK symbol. Loading into the global symbol table overwrites symbols and assumptions due to the way loaders and dlload are often implemented and those symbols are defined by things like libpthread.so on some unix distros. Sorry about the memory usage here, but it's our only safe choice. @@ -361,7 +361,7 @@ void aws_common_library_clean_up(void) { aws_unregister_error_info(&s_list); aws_unregister_log_subject_info_list(&s_common_log_subject_list); aws_json_module_cleanup(); -#if !defined(_WIN32) && !defined(WIN32) +#ifdef AWS_OS_LINUX if (g_libnuma_handle) { dlclose(g_libnuma_handle); } diff --git a/contrib/restricted/aws/aws-c-common/source/posix/system_info.c b/contrib/restricted/aws/aws-c-common/source/posix/system_info.c index e841243fb12..4a856e52522 100644 --- a/contrib/restricted/aws/aws-c-common/source/posix/system_info.c +++ b/contrib/restricted/aws/aws-c-common/source/posix/system_info.c @@ -14,8 +14,11 @@ # define __BSD_VISIBLE 1 #endif -#if defined(__linux__) || defined(__unix__) +#if defined(__linux__) # include <sys/sysinfo.h> +#endif + +#if defined(__linux__) || defined(__unix__) # include <sys/types.h> #endif |