diff options
| author | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-04-15 14:52:19 +0300 |
|---|---|---|
| committer | Artjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com> | 2020-04-15 15:05:03 +0300 |
| commit | de6d6f7d3a8cc3ad5c1e323fe1ba0f1de660de01 (patch) | |
| tree | 04e5eefd6e178c56c62cbcef99f9a9433e2038d0 /m4 | |
| parent | 32ccc9515d378e5ea55f1e22c8c55dcadc6f07b4 (diff) | |
.......PS. [ZBX-15484] use (void*) for mariadb options argument
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_lib_mysql.m4 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/m4/ax_lib_mysql.m4 b/m4/ax_lib_mysql.m4 index 808eb8f708b..cc44e4033f6 100644 --- a/m4/ax_lib_mysql.m4 +++ b/m4/ax_lib_mysql.m4 @@ -48,7 +48,7 @@ AC_DEFUN([LIBMYSQL_OPTIONS_TRY], [ - AC_MSG_CHECKING([for MySQL init options]) + AC_MSG_CHECKING([for MySQL init options function]) AC_TRY_LINK( [ #include <mysql.h> @@ -58,7 +58,8 @@ AC_DEFUN([LIBMYSQL_OPTIONS_TRY], mysql_options(mysql, MYSQL_INIT_COMMAND, "set @@session.auto_increment_offset=1"); ], - AC_DEFINE_UNQUOTED([MYSQL_OPTIONS],[mysql_options], [Define to mysql_options if it is MySQL library]) + AC_DEFINE_UNQUOTED([MYSQL_OPTIONS], [mysql_options], [Define mysql_options for MySQL]) + AC_DEFINE_UNQUOTED([MYSQL_OPTIONS_ARGS_VOID_CAST], [], [Do not define void cast for arg options for MySQL]) found_mysql_options="yes" AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) @@ -66,7 +67,7 @@ AC_DEFUN([LIBMYSQL_OPTIONS_TRY], AC_DEFUN([LIBMARIADB_OPTIONS_TRY], [ - AC_MSG_CHECKING([for MariaDB init options]) + AC_MSG_CHECKING([for MariaDB init options function]) AC_TRY_LINK( [ #include <mysql.h> @@ -74,9 +75,10 @@ AC_DEFUN([LIBMARIADB_OPTIONS_TRY], [ MYSQL *mysql; - mysql_optionsv(mysql, MYSQL_INIT_COMMAND, "set @@session.auto_increment_offset=1"); + mysql_optionsv(mysql, MYSQL_INIT_COMMAND, (void *)"set @@session.auto_increment_offset=1"); ], - AC_DEFINE_UNQUOTED([MYSQL_OPTIONS],[mysql_optionsv], [Define to mysql_optionsv if it is MariaDB library]) + AC_DEFINE_UNQUOTED([MYSQL_OPTIONS], [mysql_optionsv], [Define mysql_optionsv for MariaDB]) + AC_DEFINE_UNQUOTED([MYSQL_OPTIONS_ARGS_VOID_CAST], [(void *)], [Define void cast for arg options for MariaDB]) found_mariadb_options="yes" AC_MSG_RESULT(yes), AC_MSG_RESULT(no)) @@ -243,7 +245,7 @@ AC_DEFUN([AX_LIB_MYSQL], LIBMARIADB_OPTIONS_TRY([no]) if test "$found_mariadb_options" != "yes"; then LIBMYSQL_OPTIONS_TRY([no]) - if test "$found_mysql_options" != "yes"; then + if test "$found_mysql_options" != "yes"; then AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find the options function for mysql init]) fi |