Merge pull request #10642 from ydb-platform/mergelibs-241019-1758

Library import 241019-1758

1 files changed, 25 insertions, 15 deletions

diff --git a/contrib/libs/c-ares/src/lib/ares_library_init.c b/contrib/libs/c-ares/src/lib/ares_library_init.c
index 01d8ff1a44..f22bb3d78c 100644
--- a/contrib/libs/c-ares/src/lib/ares_library_init.c
+++ b/contrib/libs/c-ares/src/lib/ares_library_init.c
@@ -52,8 +52,6 @@ static void        *default_malloc(size_t size)
   return malloc(size);
 }
 
-#if defined(_WIN32)
-/* We need indirections to handle Windows DLL rules. */
 static void *default_realloc(void *p, size_t size)
 {
   return realloc(p, size);
@@ -63,13 +61,25 @@ static void default_free(void *p)
 {
   free(p);
 }
-#else
-#  define default_realloc realloc
-#  define default_free    free
-#endif
-void *(*ares_malloc)(size_t size)             = default_malloc;
-void *(*ares_realloc)(void *ptr, size_t size) = default_realloc;
-void (*ares_free)(void *ptr)                  = default_free;
+
+static void *(*__ares_malloc)(size_t size)             = default_malloc;
+static void *(*__ares_realloc)(void *ptr, size_t size) = default_realloc;
+static void (*__ares_free)(void *ptr)                  = default_free;
+
+void *ares_malloc(size_t size)
+{
+  return __ares_malloc(size);
+}
+
+void *ares_realloc(void *ptr, size_t size)
+{
+  return __ares_realloc(ptr, size);
+}
+
+void ares_free(void *ptr)
+{
+  __ares_free(ptr);
+}
 
 void *ares_malloc_zero(size_t size)
 {
@@ -115,13 +125,13 @@ int ares_library_init_mem(int flags, void *(*amalloc)(size_t size),
                           void *(*arealloc)(void *ptr, size_t size))
 {
   if (amalloc) {
-    ares_malloc = amalloc;
+    __ares_malloc = amalloc;
   }
   if (arealloc) {
-    ares_realloc = arealloc;
+    __ares_realloc = arealloc;
   }
   if (afree) {
-    ares_free = afree;
+    __ares_free = afree;
   }
   return ares_library_init(flags);
 }
@@ -143,9 +153,9 @@ void ares_library_cleanup_unsafe(void)
 #endif
 
   ares_init_flags = ARES_LIB_INIT_NONE;
-  ares_malloc     = malloc;
-  ares_realloc    = realloc;
-  ares_free       = free;
+  __ares_malloc   = default_malloc;
+  __ares_realloc  = default_realloc;
+  __ares_free     = default_free;
 }
 
 int ares_library_initialized_unsafe(void)