diff options
| author | thegeorg <thegeorg@yandex-team.com> | 2022-12-04 21:53:07 +0300 |
|---|---|---|
| committer | thegeorg <thegeorg@yandex-team.com> | 2022-12-04 21:53:07 +0300 |
| commit | 37667f84549acd5b0e166ad9336a3a93fcc8a57e (patch) | |
| tree | 6db671a130f35cbddb08fc294b7d74dbc7eecd26 /contrib/libs/curl/lib/curl_config.h | |
| parent | fede9a06a572babeaa9cf35cf512e073dffe626a (diff) | |
| download | ydb-37667f84549acd5b0e166ad9336a3a93fcc8a57e.tar.gz | |
Drop custom maps mobile configs support from curl and yamaker
The only usage of this configs (contrib/libs/curl) was related to switching curl dns resolver to multithreaded mode.
We have a variable for this.
Diffstat (limited to 'contrib/libs/curl/lib/curl_config.h')
| -rw-r--r-- | contrib/libs/curl/lib/curl_config.h | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/contrib/libs/curl/lib/curl_config.h b/contrib/libs/curl/lib/curl_config.h index 78b6b4c0bb..889099fd30 100644 --- a/contrib/libs/curl/lib/curl_config.h +++ b/contrib/libs/curl/lib/curl_config.h @@ -2,12 +2,8 @@ #include <util/system/platform.h> -#if defined(__ANDROID__) && defined(MAPSMOBI_BUILD) -# include "curl_config-android-maps-mobile.h" -#elif defined(__ANDROID__) +#if defined(__ANDROID__) # include "curl_config-android.h" -#elif defined(__IOS__) && defined(MAPSMOBI_BUILD) -# include "curl_config-ios-maps-mobile.h" #elif defined(__IOS__) # include "curl_config-ios.h" #elif defined(__APPLE__) @@ -51,25 +47,16 @@ #if defined(ARCADIA_CURL_DNS_RESOLVER_ARES) #define USE_ARES #elif defined(ARCADIA_CURL_DNS_RESOLVER_MULTITHREADED) - #if defined(USE_ARES) - #undef USE_ARES - #endif - #if defined(__linux__) && !defined(USE_THREADS_POSIX) - #define USE_THREADS_POSIX 1 - #elif defined(_MSC_VER) && !defined(USE_THREADS_WIN32) + #undef USE_ARES + #if defined(_MSC_VER) #define USE_THREADS_WIN32 1 + #else + #define USE_THREADS_POSIX 1 #endif #elif defined(ARCADIA_CURL_DNS_RESOLVER_SYNCHRONOUS) - // force using synchronous resolver by disabling thread support - #if defined(USE_ARES) - #undef USE_ARES - #endif - #if defined(USE_THREADS_POSIX) - #undef USE_THREADS_POSIX - #endif - #if defined(USE_THREADS_WIN32) - #undef USE_THREADS_WIN32 - #endif + #undef USE_ARES + #undef USE_THREADS_POSIX + #undef USE_THREADS_WIN32 #else #error "No dns resolver is specified or resolver specification is wrong" #endif |