From 6b4fd99cf3512f1c901e6fd36aedcb1719efe6b6 Mon Sep 17 00:00:00 2001 From: Rahim Kanji Date: Wed, 27 Dec 2023 14:37:34 +0500 Subject: [PATCH] Replaced [[maybe_unused]] with __attribute__((unused)) --- deps/mariadb-client-library/ma_priv.h.patch | 4 ++-- deps/mariadb-client-library/mariadb_lib.c.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/mariadb-client-library/ma_priv.h.patch b/deps/mariadb-client-library/ma_priv.h.patch index 027e3dc3f..ca8c9ce8c 100644 --- a/deps/mariadb-client-library/ma_priv.h.patch +++ b/deps/mariadb-client-library/ma_priv.h.patch @@ -1,5 +1,5 @@ diff --git include/ma_priv.h include/ma_priv.h -index 0fefd52e..607d92a4 100644 +index 0fefd52e..6172d0ec 100644 --- include/ma_priv.h +++ include/ma_priv.h @@ -28,10 +28,9 @@ MYSQL_FIELD * unpack_fields(const MYSQL *mysql, MYSQL_DATA *data, @@ -7,7 +7,7 @@ index 0fefd52e..607d92a4 100644 my_bool default_value); -static inline my_bool ma_has_extended_type_info(const MYSQL *mysql) -+static inline my_bool ma_has_extended_type_info([[maybe_unused]] const MYSQL *mysql) ++static inline my_bool ma_has_extended_type_info(const MYSQL *mysql __attribute__((unused))) { - return ((mysql->extension->mariadb_server_capabilities) & - (MARIADB_CLIENT_EXTENDED_METADATA >> 32)) != 0; diff --git a/deps/mariadb-client-library/mariadb_lib.c.patch b/deps/mariadb-client-library/mariadb_lib.c.patch index d384b82ea..ab3bbaf2c 100644 --- a/deps/mariadb-client-library/mariadb_lib.c.patch +++ b/deps/mariadb-client-library/mariadb_lib.c.patch @@ -1,5 +1,5 @@ diff --git libmariadb/mariadb_lib.c libmariadb/mariadb_lib.c -index e8db51a0..71f0d84a 100644 +index e8db51a0..684aff1a 100644 --- libmariadb/mariadb_lib.c +++ libmariadb/mariadb_lib.c @@ -1936,10 +1936,16 @@ restart: @@ -53,7 +53,7 @@ index e8db51a0..71f0d84a 100644 } -void ma_invalidate_stmts(MYSQL *mysql, const char *function_name) -+void ma_invalidate_stmts(MYSQL *mysql, [[maybe_unused]] const char *function_name) ++void ma_invalidate_stmts(MYSQL *mysql, const char *function_name __attribute__((unused))) { if (mysql->stmts) {