diff options
author | Alexander Smirnov <alex@ydb.tech> | 2024-11-20 11:14:58 +0000 |
---|---|---|
committer | Alexander Smirnov <alex@ydb.tech> | 2024-11-20 11:14:58 +0000 |
commit | 31773f157bf8164364649b5f470f52dece0a4317 (patch) | |
tree | 33d0f7eef45303ab68cf08ab381ce5e5e36c5240 /contrib/libs/libidn | |
parent | 2c7938962d8689e175574fc1e817c05049f27905 (diff) | |
parent | eff600952d5dfe17942f38f510a8ac2b203bb3a5 (diff) | |
download | ydb-31773f157bf8164364649b5f470f52dece0a4317.tar.gz |
Merge branch 'rightlib' into mergelibs-241120-1113
Diffstat (limited to 'contrib/libs/libidn')
-rw-r--r-- | contrib/libs/libidn/config-android.h | 5 | ||||
-rw-r--r-- | contrib/libs/libidn/config.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/contrib/libs/libidn/config-android.h b/contrib/libs/libidn/config-android.h new file mode 100644 index 0000000000..4acab536aa --- /dev/null +++ b/contrib/libs/libidn/config-android.h @@ -0,0 +1,5 @@ +#pragma once + +#include "config-linux.h" + +#undef ENABLE_NLS diff --git a/contrib/libs/libidn/config.h b/contrib/libs/libidn/config.h index 1614a4f2b6..8c623aca26 100644 --- a/contrib/libs/libidn/config.h +++ b/contrib/libs/libidn/config.h @@ -1,6 +1,8 @@ #pragma once -#if defined(__APPLE__) +#if defined(__ANDROID__) +# include "config-android.h" +#elif defined(__APPLE__) # include "config-osx.h" #elif defined(_MSC_VER) # include "config-win.h" |