aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2024-05-29 22:59:16 +0300
committerthegeorg <thegeorg@yandex-team.com>2024-05-29 23:07:24 +0300
commite19b28ad3cdf1f5a497ce4da91bcaa66b8497e1a (patch)
tree92335e0dc585c9b888f5153cd3b0c35a11760c2a
parent9b5df6a5e45b26497781f75b02fa2b27d74d5bec (diff)
downloadydb-e19b28ad3cdf1f5a497ce4da91bcaa66b8497e1a.tar.gz
Enable zstd support in contrib/libs/curl
8c3c5650ca807f132b82fa843f480bdc16e77377
-rw-r--r--contrib/libs/curl/lib/content_encoding.c2
-rw-r--r--contrib/libs/curl/lib/curl_config-linux.h6
-rw-r--r--contrib/libs/curl/lib/version.c2
-rw-r--r--contrib/libs/curl/ya.make2
4 files changed, 7 insertions, 5 deletions
diff --git a/contrib/libs/curl/lib/content_encoding.c b/contrib/libs/curl/lib/content_encoding.c
index f24f72a6d0..8534718b5f 100644
--- a/contrib/libs/curl/lib/content_encoding.c
+++ b/contrib/libs/curl/lib/content_encoding.c
@@ -45,7 +45,7 @@
#endif
#ifdef HAVE_ZSTD
-#error #include <zstd.h>
+#include <zstd.h>
#endif
#include "sendf.h"
diff --git a/contrib/libs/curl/lib/curl_config-linux.h b/contrib/libs/curl/lib/curl_config-linux.h
index dc9cef9ec7..57ecc30b9b 100644
--- a/contrib/libs/curl/lib/curl_config-linux.h
+++ b/contrib/libs/curl/lib/curl_config-linux.h
@@ -425,7 +425,7 @@
#define HAVE_LIBZ 1
/* Define to 1 if you have the `zstd' library (-lzstd). */
-/* #undef HAVE_LIBZSTD */
+#define HAVE_LIBZSTD 1
/* Define to 1 if you have the <linux/tcp.h> header file. */
#define HAVE_LINUX_TCP_H 1
@@ -754,10 +754,10 @@
/* #undef HAVE_X509_H */
/* if libzstd is in use */
-/* #undef HAVE_ZSTD */
+#define HAVE_ZSTD 1
/* Define to 1 if you have the <zstd.h> header file. */
-/* #undef HAVE_ZSTD_H */
+#define HAVE_ZSTD_H 1
/* Define to 1 if you have the `_fseeki64' function. */
/* #undef HAVE__FSEEKI64 */
diff --git a/contrib/libs/curl/lib/version.c b/contrib/libs/curl/lib/version.c
index 1213123264..d419dd49da 100644
--- a/contrib/libs/curl/lib/version.c
+++ b/contrib/libs/curl/lib/version.c
@@ -74,7 +74,7 @@
#endif
#ifdef HAVE_ZSTD
-#error #include <zstd.h>
+#include <zstd.h>
#endif
#ifdef USE_GSASL
diff --git a/contrib/libs/curl/ya.make b/contrib/libs/curl/ya.make
index 6fd1ecce6b..5f875bc0cb 100644
--- a/contrib/libs/curl/ya.make
+++ b/contrib/libs/curl/ya.make
@@ -20,12 +20,14 @@ PEERDIR(
contrib/libs/nghttp2
contrib/libs/openssl
contrib/libs/zlib
+ contrib/libs/zstd
)
ADDINCL(
GLOBAL contrib/libs/curl/include
contrib/libs/c-ares/include
contrib/libs/curl/lib
+ contrib/libs/zstd/include
)
NO_COMPILER_WARNINGS()