aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2023-10-11 19:36:38 +0300
committerthegeorg <thegeorg@yandex-team.com>2023-10-11 20:03:19 +0300
commit620ccb5f62b0df7be554b99ec7914a4cacf49b0b (patch)
treea185abf6ae9b2963b55d6e5f7c62310f0ffc2a50
parent382c2d1a7016904a0843f1e8f315b9ad70e2b3f0 (diff)
downloadydb-620ccb5f62b0df7be554b99ec7914a4cacf49b0b.tar.gz
Revert some excessive c-ares patches
-rw-r--r--contrib/libs/c-ares/include/ares.h2
-rw-r--r--contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c7
2 files changed, 1 insertions, 8 deletions
diff --git a/contrib/libs/c-ares/include/ares.h b/contrib/libs/c-ares/include/ares.h
index b7994a2589..c48df2623e 100644
--- a/contrib/libs/c-ares/include/ares.h
+++ b/contrib/libs/c-ares/include/ares.h
@@ -93,7 +93,7 @@ extern "C" {
# if defined(CARES_BUILDING_LIBRARY)
# define CARES_EXTERN __declspec(dllexport)
# else
-# define CARES_EXTERN
+# define CARES_EXTERN __declspec(dllimport)
# endif
#elif defined(CARES_BUILDING_LIBRARY) && defined(CARES_SYMBOL_HIDING)
# define CARES_EXTERN CARES_SYMBOL_SCOPE_EXTERN
diff --git a/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c b/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c
index 084c8fa198..1242a8f19a 100644
--- a/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c
+++ b/contrib/libs/c-ares/src/lib/ares_gethostbyaddr.c
@@ -36,9 +36,6 @@
#undef WIN32
#endif
-#define next_lookup next_lookup_x
-#define file_lookup file_lookup_x
-
struct addr_query {
/* Arguments passed to ares_gethostbyaddr() */
ares_channel channel;
@@ -288,7 +285,3 @@ static void ptr_rr_name(char *name, const struct ares_addr *addr)
bytes[1]&0xf, bytes[1] >> 4, bytes[0]&0xf, bytes[0] >> 4);
}
}
-
-#undef next_lookup
-#undef file_lookup
-