Replaced [[maybe_unused]] with __attribute__((unused))

sysown · Dec 27, 2023 · 6b4fd99 · 6b4fd99
1 parent 91fda88
commit 6b4fd99
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/deps/mariadb-client-library/ma_priv.h.patch b/deps/mariadb-client-library/ma_priv.h.patch
@@ -1,13 +1,13 @@
 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,
                              MA_MEM_ROOT *alloc,uint fields,
                              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
@@ -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)
    {