[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: -fix my build with new boolean typedef
From: |
gnunet |
Subject: |
[gnunet] branch master updated: -fix my build with new boolean typedef |
Date: |
Wed, 12 Aug 2020 09:41:11 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
The following commit(s) were added to refs/heads/master by this push:
new be3bbfb47 -fix my build with new boolean typedef
be3bbfb47 is described below
commit be3bbfb4728669698ad7dabb5e0d8648d31a43a8
Author: Martin Schanzenbach <mschanzenbach@posteo.de>
AuthorDate: Wed Aug 12 09:34:59 2020 +0200
-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 <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.
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnunet] branch master updated: -fix my build with new boolean typedef,
gnunet <=