From be3bbfb4728669698ad7dabb5e0d8648d31a43a8 Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Wed, 12 Aug 2020 09:34:59 +0200 Subject: -fix my build with new boolean typedef --- src/include/gnunet_my_lib.h | 2 +- src/include/gnunet_mysql_lib.h | 6 ++++++ src/mysql/mysql.c | 6 ------ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/include/gnunet_my_lib.h b/src/include/gnunet_my_lib.h index 74e7bf492..b8513ca84 100644 --- a/src/include/gnunet_my_lib.h +++ b/src/include/gnunet_my_lib.h @@ -245,7 +245,7 @@ struct GNUNET_MY_ResultSpec /** * Memory for MySQL to notify us about NULL values. */ - my_bool is_null; + MYSQL_BOOL is_null; }; diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h index 964483024..843d3ccb3 100644 --- a/src/include/gnunet_mysql_lib.h +++ b/src/include/gnunet_mysql_lib.h @@ -41,6 +41,12 @@ extern "C" #endif #endif +#ifdef HAVE_MYSQL8 + typedef bool MYSQL_BOOL; +#else + typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this +#endif + /** * Mysql context. diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c index 4df1893c6..e20debc82 100644 --- a/src/mysql/mysql.c +++ b/src/mysql/mysql.c @@ -26,12 +26,6 @@ #include #include "gnunet_mysql_lib.h" -#ifdef HAVE_MYSQL8 - typedef bool MYSQL_BOOL; -#else - typedef my_bool MYSQL_BOOL; //MySQL < 8 wants this -#endif - /** * Maximum number of supported parameters for a prepared * statement. Increase if needed. -- cgit v1.2.3