fix clang issues

pull/4199/head
Miro Stauder 3 years ago
parent 58555b639f
commit b3cc739a3c

1
deps/Makefile vendored

@ -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

@ -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 <string>
+#include <stdint.h>
namespace clickhouse {

@ -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);

Loading…
Cancel
Save