[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] branch master updated: MYSQL: Expose detected mysql boolean in
From: |
gnunet |
Subject: |
[gnunet] branch master updated: MYSQL: Expose detected mysql boolean in gnunet_mysql_compat.h |
Date: |
Sun, 05 Feb 2023 10:26:25 +0100 |
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 6b0475afe MYSQL: Expose detected mysql boolean in gnunet_mysql_compat.h
6b0475afe is described below
commit 6b0475afe46431f55cf6588bc9add529f9a0c773
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Feb 5 18:25:02 2023 +0900
MYSQL: Expose detected mysql boolean in gnunet_mysql_compat.h
gnunet_mysql_compat.h is now generated on configure.
---
configure.ac | 8 ++++++--
src/include/{gnunet_mysql_compat.h => gnunet_mysql_compat.h.in} | 4 ++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index a923050d9..2bc9d0f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -935,6 +935,7 @@ AC_ARG_WITH([mysql],
AC_SUBST(MYSQL_LDFLAGS)
AC_SUBST(MYSQL_CPPFLAGS)
+mysql_bool="bool"
# check for my_bool
AS_IF([test "x$mysql" = "xtrue"],
[AC_MSG_CHECKING([for my_bool])
@@ -944,9 +945,11 @@ AS_IF([test "x$mysql" = "xtrue"],
#no my_bool found
#endif]])],
[AC_MSG_RESULT([yes])
- AC_DEFINE_UNQUOTED([MYSQL_BOOL], [my_bool], [Bool variable for some
mysql versions])],
+ mysql_bool="my_bool"],
[AC_MSG_RESULT([no])
- AC_DEFINE_UNQUOTED([MYSQL_BOOL], [bool], [Normal boolean value])])])
+ mysql_bool="bool"])])
+
+AC_SUBST([mysql_bool])
# additional version checks for mysql
AS_IF([test "x$mysql" = "xtrue"],
@@ -1342,6 +1345,7 @@ src/identity/Makefile
src/identity/identity.conf
src/include/Makefile
src/include/gnunet_config.h
+src/include/gnunet_mysql_compat.h
src/integration-tests/Makefile
src/json/Makefile
src/hostlist/Makefile
diff --git a/src/include/gnunet_mysql_compat.h
b/src/include/gnunet_mysql_compat.h.in
similarity index 88%
rename from src/include/gnunet_mysql_compat.h
rename to src/include/gnunet_mysql_compat.h.in
index 38c7ecc63..6218386aa 100644
--- a/src/include/gnunet_mysql_compat.h
+++ b/src/include/gnunet_mysql_compat.h.in
@@ -22,6 +22,8 @@
*
* @file
* MySQL/MariaDB compatibility insanity helper header
+ * Note: gnunet_mysql_compat.h is AUTOGENERATED from gnunet_mysql_compat.h.in
+ * Please do not modify or commit gnunet_mysql_compat.h
*
* @defgroup mysql MySQL library
* Helper library to access a MySQL database.
@@ -41,6 +43,8 @@ extern "C"
#endif
#endif
+#define MYSQL_BOOL @mysql_bool@
+
#if 0 /* keep Emacsens' auto-indent happy */
{
#endif
--
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: MYSQL: Expose detected mysql boolean in gnunet_mysql_compat.h,
gnunet <=