summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schanzenbach <mschanzenbach@posteo.de>2020-08-12 09:34:59 +0200
committerMartin Schanzenbach <mschanzenbach@posteo.de>2020-08-12 09:34:59 +0200
commitbe3bbfb4728669698ad7dabb5e0d8648d31a43a8 (patch)
treee41ad616761d5a9bd93159800502bbde9efe674b
parent286759692f1d5c84da625d5c0ced374a2585e978 (diff)
-fix my build with new boolean typedef
-rw-r--r--src/include/gnunet_my_lib.h2
-rw-r--r--src/include/gnunet_mysql_lib.h6
-rw-r--r--src/mysql/mysql.c6
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 <mysql/mysql.h>
#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.