From b3cc739a3c763aa25ec2e01e4949ad07086ca72e Mon Sep 17 00:00:00 2001 From: Miro Stauder Date: Wed, 3 May 2023 17:48:13 +0000 Subject: [PATCH] fix clang issues --- deps/Makefile | 1 + deps/clickhouse-cpp/wire_format.patch | 10 ++++++++++ deps/mariadb-client-library/mysql.h.patch | 9 +++++++++ 3 files changed, 20 insertions(+) create mode 100644 deps/clickhouse-cpp/wire_format.patch diff --git a/deps/Makefile b/deps/Makefile index 9b96baef6..1a1c99007 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -199,6 +199,7 @@ ifeq ($(IS_CXX17), 1) echo ">>> Clickhouse CXX17" cd clickhouse-cpp && ln -fs clickhouse-cpp-2.3.0 clickhouse-cpp cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz && sync + cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch else echo ">>> Clickhouse CXX11" cd clickhouse-cpp && ln -fs clickhouse-cpp-1.0.0 clickhouse-cpp diff --git a/deps/clickhouse-cpp/wire_format.patch b/deps/clickhouse-cpp/wire_format.patch new file mode 100644 index 000000000..e9f74be86 --- /dev/null +++ b/deps/clickhouse-cpp/wire_format.patch @@ -0,0 +1,10 @@ +--- clickhouse-cpp/clickhouse/base/wire_format.h 2022-11-23 09:33:15.000000000 +0000 ++++ clickhouse-cpp/clickhouse/base/wire_format.h 2023-05-02 19:17:50.000000000 +0000 +@@ -1,6 +1,7 @@ + #pragma once + + #include ++#include + + namespace clickhouse { + diff --git a/deps/mariadb-client-library/mysql.h.patch b/deps/mariadb-client-library/mysql.h.patch index e7b4d06cd..ce8c6115d 100644 --- a/deps/mariadb-client-library/mysql.h.patch +++ b/deps/mariadb-client-library/mysql.h.patch @@ -24,3 +24,12 @@ int STDCALL mysql_set_character_set_cont(int *ret, MYSQL *mysql, int status); int STDCALL mysql_change_user_start(my_bool *ret, MYSQL *mysql, +@@ -752,7 +752,7 @@ + unsigned long (STDCALL *mysql_thread_id)(MYSQL *mysql); + const char * (STDCALL *mysql_character_set_name)(MYSQL *mysql); + void (STDCALL *mysql_get_character_set_info)(MYSQL *mysql, MY_CHARSET_INFO *cs); +- int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname); ++ int (STDCALL *mysql_set_character_set)(MYSQL *mysql, const char *csname, uint charsetnr); + my_bool (*mariadb_get_infov)(MYSQL *mysql, enum mariadb_value value, void *arg, ...); + my_bool (STDCALL *mariadb_get_info)(MYSQL *mysql, enum mariadb_value value, void *arg); + MYSQL * (STDCALL *mysql_init)(MYSQL *mysql);