diff options
author | aleexfi <aleexfi@yandex-team.com> | 2022-12-06 14:42:51 +0300 |
---|---|---|
committer | aleexfi <aleexfi@yandex-team.com> | 2022-12-06 14:42:51 +0300 |
commit | e32ded7b7757286f092548b2731c598704928c62 (patch) | |
tree | d281a7438c386f9dc35ca7dd31162c18e71447cf | |
parent | c98004737b7c07ca8fc7d840690738cd1d405ed2 (diff) | |
download | ydb-e32ded7b7757286f092548b2731c598704928c62.tar.gz |
Fix nallocx redefinition when using lf allocator on windows
-rw-r--r-- | library/cpp/yt/malloc/CMakeLists.txt | 1 | ||||
-rw-r--r-- | library/cpp/yt/malloc/dummy_malloc.cpp | 17 | ||||
-rw-r--r-- | library/cpp/yt/malloc/malloc.cpp | 13 |
3 files changed, 18 insertions, 13 deletions
diff --git a/library/cpp/yt/malloc/CMakeLists.txt b/library/cpp/yt/malloc/CMakeLists.txt index ead9e4e1e4..60ae2a46b3 100644 --- a/library/cpp/yt/malloc/CMakeLists.txt +++ b/library/cpp/yt/malloc/CMakeLists.txt @@ -14,4 +14,5 @@ target_link_libraries(cpp-yt-malloc PUBLIC ) target_sources(cpp-yt-malloc PRIVATE ${CMAKE_SOURCE_DIR}/library/cpp/yt/malloc/malloc.cpp + ${CMAKE_SOURCE_DIR}/library/cpp/yt/malloc/dummy_malloc.cpp ) diff --git a/library/cpp/yt/malloc/dummy_malloc.cpp b/library/cpp/yt/malloc/dummy_malloc.cpp new file mode 100644 index 0000000000..4a35758cab --- /dev/null +++ b/library/cpp/yt/malloc/dummy_malloc.cpp @@ -0,0 +1,17 @@ +#include "malloc.h" + +#include <util/system/compiler.h> + +//////////////////////////////////////////////////////////////////////////////// + +Y_WEAK extern "C" size_t nallocx(size_t size, int /*flags*/) noexcept +{ + return size; +} + +Y_WEAK extern "C" size_t malloc_usable_size(void* /*ptr*/) noexcept +{ + return 0; +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/library/cpp/yt/malloc/malloc.cpp b/library/cpp/yt/malloc/malloc.cpp index 9a055eaaa0..abb04e60f9 100644 --- a/library/cpp/yt/malloc/malloc.cpp +++ b/library/cpp/yt/malloc/malloc.cpp @@ -1,24 +1,11 @@ #include "malloc.h" -#include <util/system/compiler.h> #include <util/system/platform.h> #include <stdlib.h> //////////////////////////////////////////////////////////////////////////////// -#ifndef _win_ -Y_WEAK extern "C" size_t nallocx(size_t size, int /*flags*/) noexcept -{ - return size; -} - -Y_WEAK extern "C" size_t malloc_usable_size(void* /*ptr*/) noexcept -{ - return 0; -} -#endif - void* aligned_malloc(size_t size, size_t alignment) { #if defined(_win_) |